diff options
Diffstat (limited to 'debian/patches/libexec.patch')
| -rw-r--r-- | debian/patches/libexec.patch | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/debian/patches/libexec.patch b/debian/patches/libexec.patch index 18634a35..dc901b77 100644 --- a/debian/patches/libexec.patch +++ b/debian/patches/libexec.patch @@ -1,7 +1,9 @@ -diff --git a/config/ttys b/config/ttys -index 6a548d5..d10bfcc 100644 ---- a/config/ttys -+++ b/config/ttys +libexec is not FHS + +Index: hurd-debian/config/ttys +=================================================================== +--- hurd-debian.orig/config/ttys ++++ hurd-debian/config/ttys @@ -4,11 +4,11 @@ # name program type status comments @@ -22,26 +24,24 @@ index 6a548d5..d10bfcc 100644 +tty5 "/sbin/getty 38400" hurd on secure trusted console +tty6 "/sbin/getty 38400" hurd on secure trusted console +#com0 "/sbin/getty 9600" dialup on secure -diff --git a/daemons/runsystem.sh b/daemons/runsystem.sh -index c3cb2d6..0ce4f59 100644 ---- a/daemons/runsystem.hurd -+++ b/daemons/runsystem.hurd -@@ -23,8 +23,8 @@ fallback_shells='/bin/sh /bin/bash /bin/csh /bin/ash /bin/shd' - SHELL=/bin/sh +Index: hurd-debian/doc/hurd.texi +=================================================================== +--- hurd-debian.orig/doc/hurd.texi ++++ hurd-debian/doc/hurd.texi +@@ -566,7 +566,7 @@ The @option{--multiboot-command-line} op + it is a root filesystem, which triggers it to run @command{/hurd/startup} as PID + 2. @command{/hurd/startup} starts the @command{/hurd/proc} and + @command{/hurd/auth} servers. After the servers are launched +-@command{/hurd/startup} starts the @command{/libexec/runsystem.sh} script to ++@command{/hurd/startup} starts the @command{/etc/hurd/runsystem.sh} script to + finish booting. - # Programs that do multi-user startup. --RUNCOM=/libexec/rc --RUNTTYS=/libexec/runttys -+RUNCOM=/etc/hurd/rc -+RUNTTYS=/sbin/runttys - # Signals that we should pass down to runttys. - runttys_sigs='TERM INT HUP TSTP' - -diff --git a/init/init.c b/init/init.c -index d66bee0..14d822e 100644 ---- a/startup/startup.c -+++ b/startup/startup.c -@@ -888,7 +888,7 @@ frob_kernel_process (void) + After the Hurd has been booted, other sets of core Hurd servers can be +Index: hurd-debian/startup/startup.c +=================================================================== +--- hurd-debian.orig/startup/startup.c ++++ hurd-debian/startup/startup.c +@@ -912,7 +912,7 @@ frob_kernel_process (void) /** Running userland. **/ /* In the "split-init" setup, we just run a single program (usually @@ -50,7 +50,7 @@ index d66bee0..14d822e 100644 If it does exit (or can't be started), we go to an emergency single-user shell as a fallback. */ -@@ -1004,7 +1004,7 @@ process_signal (int signo) +@@ -980,7 +980,7 @@ process_signal (int signo) } } @@ -59,7 +59,7 @@ index d66bee0..14d822e 100644 with the given additional arguments. */ static int start_child (const char *prog, char **progargs) -@@ -1016,7 +1016,7 @@ start_child (const char *prog, char **progargs) +@@ -992,7 +992,7 @@ start_child (const char *prog, char **pr if (progargs == 0) { @@ -68,7 +68,7 @@ index d66bee0..14d822e 100644 err = argz_create ((char **) argv, &args, &arglen); } else -@@ -1026,7 +1026,7 @@ start_child (const char *prog, char **progargs) +@@ -1002,7 +1002,7 @@ start_child (const char *prog, char **pr ++argc; { const char *argv[2 + argc + 1]; @@ -77,12 +77,14 @@ index d66bee0..14d822e 100644 argv[1] = prog; argv[2 + argc] = 0; while (argc-- > 0) -@@ -1086,7 +1086,7 @@ launch_something (const char *why) +@@ -1062,8 +1062,8 @@ launch_something (const char *why) static unsigned int try; static const char *const tries[] = { - "/libexec/runsystem", +- "/libexec/runsystem.gnu", + "/etc/hurd/runsystem", ++ "/etc/hurd/runsystem.gnu", _PATH_BSHELL, "/bin/shd", /* XXX */ }; |