diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/hurd-udeb.install | 4 | ||||
| -rw-r--r-- | debian/hurd-udeb.lintian-overrides | 1 | ||||
| -rw-r--r-- | debian/hurd.install | 10 | ||||
| -rw-r--r-- | debian/hurd.postinst | 7 | ||||
| -rw-r--r-- | debian/patches/libexec.patch | 103 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 3 |
8 files changed, 124 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index a40d865b..7977e9e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ hurd (20111106-2) UNRELEASED; urgency=low - * debian/control: + * control: - Use hurd-any instead of hurd-i386. - Recommend bf-utf-source to get more than just latin1 on the console. - * debian/hurd.postinst: Set up "*random" alternatives and generate seed on + * hurd.postinst: Set up "*random" alternatives and generate seed on first install too. + * patches/libexec.patch, hurd.install, hurd-udeb.install, hurd.postinst, + rules: Move getty, console-run, and runttys to /sbin, runsystem and rc to + /etc/hurd (Closes: Bug#556526). + * hurd-udeb.lintian-overrides: Drop override about /libexec -- Samuel Thibault <sthibault@debian.org> Sun, 06 Nov 2011 19:51:54 +0100 diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install index a4a9313d..c8836b4f 100644 --- a/debian/hurd-udeb.install +++ b/debian/hurd-udeb.install @@ -1,4 +1,4 @@ -debian/local/runsystem libexec +debian/local/runsystem etc/hurd debian/local/setup-translators usr/lib/hurd debian/local/partman lib debian/local/finish-install.d usr/lib @@ -6,7 +6,7 @@ debian/tmp/lib/*.so.* debian/tmp/lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console debian/tmp/lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console debian/tmp/lib/hurd/console/vga.so.* usr/lib/hurd/console -debian/tmp/libexec/console-run +debian/tmp/libexec/console-run sbin debian/tmp/sbin/e2os debian/tmp/sbin/MAKEDEV debian/tmp/sbin/losetup diff --git a/debian/hurd-udeb.lintian-overrides b/debian/hurd-udeb.lintian-overrides index 5953ec00..0f8c470e 100644 --- a/debian/hurd-udeb.lintian-overrides +++ b/debian/hurd-udeb.lintian-overrides @@ -1,3 +1,2 @@ non-standard-toplevel-dir hurd/ -non-standard-toplevel-dir libexec/ non-standard-toplevel-dir servers/ diff --git a/debian/hurd.install b/debian/hurd.install index 63e8d02e..9f5200d9 100644 --- a/debian/hurd.install +++ b/debian/hurd.install @@ -2,11 +2,11 @@ debian/local/setup-translators usr/lib/hurd debian/tmp/lib/*.so.* debian/tmp/lib/hurd/console/*.so.* usr/lib/hurd/console debian/tmp/hurd/* -debian/tmp/libexec/rc -debian/tmp/libexec/getty -debian/tmp/libexec/console-run -debian/tmp/libexec/runttys -debian/tmp/libexec/runsystem.gnu +debian/tmp/libexec/rc etc/hurd/rc +debian/tmp/libexec/getty sbin +debian/tmp/libexec/console-run sbin +debian/tmp/libexec/runttys sbin +debian/tmp/libexec/runsystem.gnu etc/hurd/rc debian/tmp/sbin/nfsd debian/tmp/sbin/e2os debian/tmp/sbin/MAKEDEV diff --git a/debian/hurd.postinst b/debian/hurd.postinst index 000afe63..23364691 100644 --- a/debian/hurd.postinst +++ b/debian/hurd.postinst @@ -2,8 +2,13 @@ set -e +if [ "$1" = configure ] && [ "$2" ]; then + # Upgrade from old version: drop /libexec/runsystem + update-alternatives --quiet \ + --remove runsystem /libexec/runsystem.gnu +fi update-alternatives --quiet \ - --install /libexec/runsystem runsystem /libexec/runsystem.gnu 20 + --install /etc/hurd/runsystem runsystem /etc/hurd/runsystem.gnu 20 update-alternatives \ --install /usr/bin/fakeroot fakeroot /usr/bin/fakeroot-hurd 30 diff --git a/debian/patches/libexec.patch b/debian/patches/libexec.patch new file mode 100644 index 00000000..d46b7692 --- /dev/null +++ b/debian/patches/libexec.patch @@ -0,0 +1,103 @@ +diff --git a/config/ttys b/config/ttys +index 6a548d5..d10bfcc 100644 +--- a/config/ttys ++++ b/config/ttys +@@ -4,11 +4,11 @@ + + # name program type status comments + +-console "/libexec/getty 9600" mach-color on secure trusted console +-tty1 "/libexec/getty 38400" hurd on secure trusted console +-tty2 "/libexec/getty 38400" hurd on secure trusted console +-tty3 "/libexec/getty 38400" hurd on secure trusted console +-tty4 "/libexec/getty 38400" hurd on secure trusted console +-tty5 "/libexec/getty 38400" hurd on secure trusted console +-tty6 "/libexec/getty 38400" hurd on secure trusted console +-#com0 "/libexec/getty 9600" dialup on secure ++console "/sbin/getty 9600" mach-color on secure trusted console ++tty1 "/sbin/getty 38400" hurd on secure trusted console ++tty2 "/sbin/getty 38400" hurd on secure trusted console ++tty3 "/sbin/getty 38400" hurd on secure trusted console ++tty4 "/sbin/getty 38400" hurd on secure trusted console ++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.sh ++++ b/daemons/runsystem.sh +@@ -23,8 +23,8 @@ fallback_shells='/bin/sh /bin/bash /bin/csh /bin/ash /bin/shd' + SHELL=/bin/sh + + # 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/doc/hurd.texi b/doc/hurd.texi +index ea73a4c..7d7af39 100644 +--- a/doc/hurd.texi ++++ b/doc/hurd.texi +@@ -570,7 +570,7 @@ The @option{--multiboot-command-line} option tells the file system server that + it is a root filesystem, which triggers it to run @command{/hurd/init} as PID + 1. @command{/hurd/init} starts the @command{/hurd/proc} and + @command{/hurd/auth} servers. After the servers are launched +-@command{/hurd/init} starts the @command{/libexec/runsystem.sh} script to ++@command{/hurd/init} starts the @command{/etc/hurd/runsystem.sh} script to + finish booting. + + After the Hurd has been booted, other sets of core Hurd servers can be +diff --git a/init/init.c b/init/init.c +index d66bee0..14d822e 100644 +--- a/init/init.c ++++ b/init/init.c +@@ -888,7 +888,7 @@ frob_kernel_process (void) + /** Running userland. **/ + + /* In the "split-init" setup, we just run a single program (usually +- /libexec/runsystem) that is not expected to ever exit (or stop). ++ /etc/hurd/runsystem) that is not expected to ever exit (or stop). + 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) + } + } + +-/* Start the child program PROG. It is run via /libexec/console-run ++/* Start the child program PROG. It is run via /sbin/console-run + 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) + + if (progargs == 0) + { +- const char *argv[] = { "/libexec/console-run", prog, 0 }; ++ const char *argv[] = { "/sbin/console-run", prog, 0 }; + err = argz_create ((char **) argv, &args, &arglen); + } + else +@@ -1026,7 +1026,7 @@ start_child (const char *prog, char **progargs) + ++argc; + { + const char *argv[2 + argc + 1]; +- argv[0] = "/libexec/console-run"; ++ argv[0] = "/sbin/console-run"; + argv[1] = prog; + argv[2 + argc] = 0; + while (argc-- > 0) +@@ -1086,8 +1086,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 */ + }; diff --git a/debian/patches/series b/debian/patches/series index 6533d49a..85672278 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,3 +31,4 @@ libdiskfs_sync.patch libpthread_globsigdisp.patch posix-sigcodes.patch random-default-fast.patch +libexec.patch diff --git a/debian/rules b/debian/rules index 5fe4968e..0e8dad9e 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,6 @@ CC=gcc-4.6 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_CONFIGURE_LIBEXECDIR ="\$${prefix}/libexec" DEB_CONFIGURE_USER_FLAGS := --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs' DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var DEB_DH_STRIP_ARGS := --dbg-package=hurd @@ -35,7 +34,7 @@ build/hurd:: install/hurd:: # runsystem is managed by update-alternatives - mv debian/tmp/libexec/runsystem debian/tmp/libexec/runsystem.gnu + mv debian/tmp/etc/hurd/runsystem debian/tmp/etc/hurd/runsystem.gnu # move away fakeroot, ps, uptime, vmstat and w to not conflict with the # ones from other packages |