r749 - in /hurd/trunk/debian: changelog hurd-udeb.install local/runsystem local/runsystem.gnu

[sthibault]

Author: sthibault
Date: Fri Jun 18 08:15:14 2010
New Revision: 749

URL: http://svn.debian.org/wsvn/pkg-hurd/hurd/?sc=1&rev=749
Log:
  * debian/local/runsystem.gnu: Integrate jkoenig d-i changes, rename to
    debian/local/runsystem.

Added:
    hurd/trunk/debian/local/runsystem
      - copied, changed from r747, hurd/trunk/debian/local/runsystem.gnu
Removed:
    hurd/trunk/debian/local/runsystem.gnu
Modified:
    hurd/trunk/debian/changelog
    hurd/trunk/debian/hurd-udeb.install

Modified: hurd/trunk/debian/changelog
URL: 
http://svn.debian.org/wsvn/pkg-hurd/hurd/hurd/trunk/debian/changelog?rev=749&op=diff
==============================================================================
--- hurd/trunk/debian/changelog (original)
+++ hurd/trunk/debian/changelog Fri Jun 18 08:15:14 2010
@@ -34,7 +34,9 @@
     Fredrik Hammar to fix random startup crash (Closes: Bug#576519).
   * debian/patches/procfs.patch: Fix swap size printout.
   * debian/hurd-udeb.install: remove reboot and halt (will be provided by
-    busybox), remove crash and password (not useful), add procfs.
+    busybox), remove crash and password (not useful), add procfs, remove rc.
+  * debian/local/runsystem.gnu: Integrate jkoenig d-i changes, rename to
+    debian/local/runsystem.
 
   [ Guillem Jover ]
   * Update make-new-tarball.sh to exclude git instead of CVS paths.

Modified: hurd/trunk/debian/hurd-udeb.install
URL: 
http://svn.debian.org/wsvn/pkg-hurd/hurd/hurd/trunk/debian/hurd-udeb.install?rev=749&op=diff
==============================================================================
--- hurd/trunk/debian/hurd-udeb.install (original)
+++ hurd/trunk/debian/hurd-udeb.install Fri Jun 18 08:15:14 2010
@@ -1,8 +1,7 @@
+debian/local/runsystem libexec
 debian/tmp/lib/*.so.*
 debian/tmp/lib/hurd/console/*.so.* usr/lib/hurd/console
-debian/tmp/libexec/rc
 debian/tmp/libexec/console-run
-debian/local/runsystem.gnu /libexec
 debian/tmp/sbin/e2os
 debian/tmp/sbin/MAKEDEV
 debian/tmp/sbin/losetup

Copied: hurd/trunk/debian/local/runsystem (from r747, 
hurd/trunk/debian/local/runsystem.gnu)
URL: 
http://svn.debian.org/wsvn/pkg-hurd/hurd/hurd/trunk/debian/local/runsystem?rev=749&op=diff
==============================================================================
--- hurd/trunk/debian/local/runsystem.gnu (original)
+++ hurd/trunk/debian/local/runsystem Fri Jun 18 08:15:14 2010
@@ -3,84 +3,77 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PATH
 
-SHELL=/bin/sh
-RUNCOM=/libexec/rc
+# Usage: foldsubst <pat> xxxx yyyy zzzz ...
+# <pat> is substituted for every character of xxxx with sed, the character in
+# question being accessible as a '\0' in <pat>, and the result is used as the
+# new pattern to handle the remaining arguments.
+foldsubst () {
+       [ "$2" ] || { echo $1; return; }
+       expanded=$(echo "$2" | sed "s/./ $1/g"); shift 2
+       foldsubst "$expanded" $@;
+}
 
-mkdir /servers/
-mkdir /servers/socket
-settrans -c /servers/socket/1 /hurd/pflocal
-settrans -c /servers/socket/2 /hurd/pfinet
-settrans -ck /servers/exec /hurd/exec
-settrans -c /servers/crash-suspend /hurd/crash --suspend
-settrans -c /servers/crash-kill /hurd/crash --kill
-settrans -c /servers/password /hurd/password
-settrans -c /servers/crash-suspend /hurd/crash --suspend
-settrans -c /servers/crash-dump-core /hurd/crash --dump-core
-settrans -c /servers/default-pager /hurd/proxy-defpager
-settrans /proc /hurd/procfs
-ln -s crash-kill /servers/crash
+# Verbosely attach a translator.
+st () {
+       echo -n " $1"
+       settrans -ck /servers/$1 /hurd/$2
+}
+
+# Verbosely create device nodes,
+# after the aguments are filtered through foldsubst.
+md () {
+       pattern=$1; shift
+       sedrepl=$(echo $pattern | sed -e 's/X/\\0/' -e 's/Y/\\\\0/')
+       devs=$(foldsubst "$sedrepl" $@)
+       (cd /dev; ./MAKEDEV $devs)
+       echo -n " $pattern"
+}
+
+
+echo -n "Setting up translators:"
+mkdir -p /servers/socket
 ln -s 1 /servers/socket/local
 ln -s 2 /servers/socket/inet
+st socket/1 pflocal
+st socket/2 pfinet
+st exec exec
+st default-pager proxy-defpager
+echo .
 
-# would be better than the -N parameter given to genext2fs
-#settrans /dev /hurd/tmpfs 1M
-#ln -s /sbin/MAKEDEV /dev
+echo -n "Creating device nodes:"
+md 'fd std vcs'
+md ttyX 1234
+md ptypX 0123
+md loopX 0123
+md hdX 0123
+md hdXsY 0123 12345678
+echo .
 
-echo "setting up /dev"
-cd /dev
-rm -f null
-rm -f console
-./MAKEDEV fd
-./MAKEDEV std com0 vcs tty1 tty2 tty3 tty4 tty5 tty6 hd0 hd1 hd2 hd3 loop0 
loop1
-echo "setting up /dev/pty*"
-for i in 0 1 2 3 4
-do
-       ./MAKEDEV ptyp$i ptyq$i
-done
-echo "setting up /dev/hd*"
-for i in 0 1
-do
-       for j in 1 2 3 4 5 6 7 8
-       do
-               ./MAKEDEV hd${i}s${j}
-       done
-done
-cd /
+echo -n "Starting procfs"
+settrans -g /proc /hurd/procfs
+echo .
 
-echo "running rc"
-# Run the rc script.  As long as it exits nonzero, punt to single-user.
-# After the single-user shell exits, we will start over attempting to
-# run rc; but later invocations strip the `autoboot' argument.
-until $rc; do
-  rc=${RUNCOM}
-
-  # Run single-user shell and repeat as long as it dies with a signal.
-  until ${SHELL} || test $? -lt 128; do
-    :
-  done
-done
-
+echo -n "Starting the Hurd console..."
 # Touch the first tty so that the Hurd console is certain to pick it
 # and not some random other tty.
+sleep 1
 touch /dev/tty1
+console -d vga -d pc_kbd -c /dev/vcs &
+sleep 1
+# Switch over
+exec < /dev/tty1 > /dev/tty1 2>&1
+echo "Console started."
 
-# Startup the Hurd console.
-console -d vga -d pc_kbd -c /dev/vcs &
+# Set the console device used by /sbin/reopen-console
+echo /dev/tty1 >/var/run/console-device
 
-sleep 1
+TERM=hurd
+export TERM
 
-exec < /dev/tty1 > /dev/tty1 2>&1
+# Preset the terminal type for /lib/debian-installer/detect-console
+TERM_TYPE=virtual
+export TERM_TYPE
 
-echo here is the console
-echo "Starting d-i's init in 2s, hoping for the best"
-sleep 2
+# Invoke init as linuxrc to work around pid != 1
+exec /bin/busybox linuxrc
 
-/bin/busybox init
-
-echo "d-i init died, please press ctrl-alt-backspace to get back to the Mach 
console"
-
-# Kill our own console so it doesn't interfere with the emergency shell
-kill 7
-
-# Shouldn't even be reached
-exit 1