hurd-udeb.runsystem: New runsystem file for the d-i case, incomplete for now.

hurd-udeb.install: Remove getty, runttys, /etc/ttys ftpcp, ftpdir, ftpfs, hostmux, usermux, nfs, rpctrace, gcore, forks. Install hurd-udeb.runsystem as /libexec/runsystem.gnu.

3 files changed, 51 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 50b51e4c..ecf077eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ hurd (20090404-3) UNRELEASED; urgency=low
     - Drop duplicate priority and section fields.
     - Add ${misc:Depends}.
     - Add dpkg (>= 1.15.4) | install-info dependency.
+  * hurd-udeb.runsystem: New runsystem file for the d-i case, incomplete for
+    now.
+  * hurd-udeb.install: Remove getty, runttys, /etc/ttys ftpcp, ftpdir, ftpfs,
+    hostmux, usermux, nfs, rpctrace, gcore, forks. Install hurd-udeb.runsystem
+    as /libexec/runsystem.gnu.
 
   [ Guillem Jover ]
   * Update make-new-tarball.sh to exclude git instead of CVS paths.
diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install
index 5087ac2c..6e0b5d3c 100644
--- a/debian/hurd-udeb.install
+++ b/debian/hurd-udeb.install
@@ -1,10 +1,8 @@
 debian/tmp/lib/*.so.*
 debian/tmp/lib/hurd/console/*.so.* usr/lib/hurd/console
 debian/tmp/libexec/rc
-debian/tmp/libexec/getty
 debian/tmp/libexec/console-run
-debian/tmp/libexec/runttys
-debian/tmp/libexec/runsystem.gnu
+debian/hurd-udeb.runsystem /libexec/runsystem.gnu
 debian/tmp/sbin/e2os
 debian/tmp/sbin/MAKEDEV
 debian/tmp/sbin/losetup
@@ -35,16 +33,11 @@ debian/tmp/bin/addauth
 debian/tmp/bin/rmauth
 debian/tmp/bin/unsu
 debian/tmp/bin/setauth
-debian/tmp/bin/ftpcp
-debian/tmp/bin/ftpdir
 debian/tmp/bin/storecat
 debian/tmp/bin/storeread
 debian/tmp/bin/msgport
-debian/tmp/bin/rpctrace
 debian/tmp/bin/mount
-debian/tmp/bin/gcore
-debian/tmp/bin/forks
-debian/tmp/etc/ttys
+debian/hurd-udeb.ttys /etc/ttys
 debian/tmp/dev/MAKEDEV
 debian/tmp/hurd/auth
 debian/tmp/hurd/console
@@ -55,9 +48,7 @@ debian/tmp/hurd/ext2fs.static
 debian/tmp/hurd/fatfs
 debian/tmp/hurd/fifo
 debian/tmp/hurd/firmlink
-debian/tmp/hurd/ftpfs
 debian/tmp/hurd/fwd
-debian/tmp/hurd/hostmux
 debian/tmp/hurd/ifsock
 debian/tmp/hurd/init
 debian/tmp/hurd/iso9660fs
@@ -65,7 +56,6 @@ debian/tmp/hurd/iso9660fs.static
 debian/tmp/hurd/mach-defpager
 debian/tmp/hurd/magic
 debian/tmp/hurd/new-fifo
-debian/tmp/hurd/nfs
 debian/tmp/hurd/null
 debian/tmp/hurd/password
 debian/tmp/hurd/pfinet
@@ -77,4 +67,3 @@ debian/tmp/hurd/streamio
 debian/tmp/hurd/symlink
 debian/tmp/hurd/term
 debian/tmp/hurd/tmpfs
-debian/tmp/hurd/usermux
diff --git a/debian/hurd-udeb.runsystem b/debian/hurd-udeb.runsystem
new file mode 100755
index 00000000..5f49c939
--- /dev/null
+++ b/debian/hurd-udeb.runsystem
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH
+
+SHELL=/bin/sh
+RUNCOM=/libexec/rc
+
+# See whether pflocal is setup already, and do so if not (install case)
+
+if ! test -e /servers/socket/1 && which settrans >/dev/null ; then
+  settrans -c /servers/socket/1 /hurd/pflocal
+fi
+
+# TODO:
+# set up translators, /dev, etc. (./native-install, roughly)
+
+# 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
+
+# Touch the first tty so that the Hurd console is certain to pick it
+# and not some random other tty.
+touch /dev/tty1
+
+# Startup the Hurd console.
+console -d vga -d pc_kbd -c /dev/vcs
+
+echo "Starting d-i's init in 2s, hoping for the best"
+sleep 2
+
+/bin/init
+
+echo "d-i init died"
+
+exit 1