[hurd] 01/01: patches/rc.patch: Make sure /proc is mounted at boot.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 631769427d765480be6cf29fb61df8d63923f6cd
Author: Samuel Thibault <address@hidden>
Date:   Sun Sep 22 01:08:57 2013 +0200

    patches/rc.patch: Make sure /proc is mounted at boot.
---
 debian/changelog        |    2 ++
 debian/patches/rc.patch |   25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2c3c51..e90e2db 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 3bcff71..fffbb46 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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git