summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-10-05 13:30:34 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-10-05 13:30:34 +0200
commit6f8061605d68f66ea9e27d5245e0340d50deede3 (patch)
treea7dce0114ef189438b7d3d8d3a030f1da6750517 /debian
parent5510f02101c0e21f797dfaedcf56bfeb8865edb5 (diff)
patches/proc_set_init_task.patch: Fix kernel pid in procfs too.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/proc_set_init_task.patch22
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ad9498cd..d5259a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hurd (1:0.5.git20130928-2) UNRELEASED; urgency=low
+
+ * patches/proc_set_init_task.patch: Fix kernel pid in procfs too.
+
+ -- Samuel Thibault <sthibault@debian.org> Sat, 05 Oct 2013 13:30:05 +0200
+
hurd (1:0.5.git20130928-1) unstable; urgency=low
* New upstream release, yay!
diff --git a/debian/patches/proc_set_init_task.patch b/debian/patches/proc_set_init_task.patch
index 0f9397b2..84383fe1 100644
--- a/debian/patches/proc_set_init_task.patch
+++ b/debian/patches/proc_set_init_task.patch
@@ -276,3 +276,25 @@ index 80f8397..b544b8d 100644
struct proc *allocate_proc (task_t);
void proc_death_notify (struct proc *);
void complete_proc (struct proc *, pid_t);
+diff --git a/procfs/main.c b/procfs/main.c
+index 54e9682..8727f86 100644
+--- a/procfs/main.c
++++ b/procfs/main.c
+@@ -42,7 +42,7 @@ uid_t opt_anon_owner;
+ #define OPT_CLK_TCK sysconf(_SC_CLK_TCK)
+ #define OPT_STAT_MODE 0400
+ #define OPT_FAKE_SELF -1
+-#define OPT_KERNEL_PID 2
++#define OPT_KERNEL_PID 3
+ #define OPT_ANON_OWNER 0
+
+ #define NODEV_KEY -1 /* <= 0, so no short option. */
+@@ -153,7 +153,7 @@ struct argp_option common_options[] = {
+ { "kernel-process", 'k', "PID", 0,
+ "Process identifier for the kernel, used to retreive its command "
+ "line, as well as the global up and idle times. "
+- "(default: 2)" },
++ "(default: 3)" },
+ { "compatible", 'c', NULL, 0,
+ "Try to be compatible with the Linux procps utilities. "
+ "Currently equivalent to -h 100 -s 0444 -S 1." },