diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-22 01:08:57 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-22 01:08:57 +0200 |
| commit | d95879de90e55162d01c0768165d4f321bbe6bd3 (patch) | |
| tree | 2df5e27b0fa13a1fcb7f056ba79421f144ca820c | |
| parent | 081c8ca3fb2807f876ff92712c61f39bcc66f30b (diff) | |
patches/rc.patch: Make sure /proc is mounted at boot.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/rc.patch | 25 |
2 files changed, 16 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index e2c3c513..e90e2db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ hurd (20130916-2) UNRELEASED; urgency=low + [ Samuel Thibault ] * control, hurd.install.in, rules: Remove ufs parts. + * patches/rc.patch: Make sure /proc is mounted at boot. [ Justus Winter ] * Include the nullauth utility in hurd and hurd-udeb. diff --git a/debian/patches/rc.patch b/debian/patches/rc.patch index 3bcff71f..fffbb467 100644 --- a/debian/patches/rc.patch +++ b/debian/patches/rc.patch @@ -3,11 +3,9 @@ More debianish rc scripts daemons/rc.sh | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) -Index: hurd-debian/daemons/rc.sh -=================================================================== ---- hurd-debian.orig/daemons/rc.sh 2013-09-16 07:43:39.000000000 +0000 -+++ hurd-debian/daemons/rc.sh 2013-09-16 07:44:04.000000000 +0000 -@@ -19,14 +19,17 @@ +--- a/daemons/rc.sh ++++ b/daemons/rc.sh +@@ -19,14 +19,17 @@ then echo Automatic boot in progress... date @@ -26,7 +24,7 @@ Index: hurd-debian/daemons/rc.sh ;; # Fsck couldn't fix it. 4 | 8) -@@ -85,12 +88,20 @@ +@@ -85,12 +88,25 @@ if test -d /tmp; then fi if test -d /var/run; then @@ -45,26 +43,31 @@ Index: hurd-debian/daemons/rc.sh -# This file must exist for e2fsck to work. XXX -touch /var/run/mtab ++# See whether procfs is set up ++if ! test -e /proc/cmdline ; then ++ settrans -c /proc /hurd/procfs --compatible ++fi ++ +# This file must exist for e2fsck to work. +ln -s /proc/mounts /var/run/mtab #echo -n restoring pty permissions... #chmod 666 /dev/tty[pqrs]* -@@ -104,15 +115,25 @@ +@@ -104,15 +120,25 @@ touch /var/run/mtab chmod 664 /etc/motd -echo -n starting daemons: -+( -+ trap ":" INT QUIT TSTP - +- -/sbin/syslogd && echo -n ' syslogd' -/sbin/inetd && echo -n ' inetd' - -if test -x /sbin/sendmail -a -r /etc/sendmail.cf; then - /sbin/sendmail -bd -q30m && echo -n ' sendmail' -fi -- ++( ++ trap ":" INT QUIT TSTP + -echo . + if [ -d /etc/rc.boot ] + then |