summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/local/setup-translators4
-rw-r--r--debian/patches/run.patch16
-rw-r--r--debian/patches/series1
4 files changed, 19 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 4638563c..67d79862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ hurd (20111126-1~0) UNRELEASED; urgency=low
/dev/u?random in hurd-udeb too.
* hurd-udeb.install: Add /hurd/random.
* hurd.install: Add /etc/securetty.
+ * local/setup-translators: Move /run initialization to...
+ * patches/run.patch: ... boot time.
-- Samuel Thibault <sthibault@debian.org> Sun, 06 Nov 2011 19:51:54 +0100
diff --git a/debian/local/setup-translators b/debian/local/setup-translators
index 4f678d90..38a23129 100755
--- a/debian/local/setup-translators
+++ b/debian/local/setup-translators
@@ -156,9 +156,5 @@ st kbd '/hurd/symlink cons/kbd' kbd
st mouse '/hurd/symlink cons/mouse' mouse
st shm '/hurd/symlink /run/shm' shm
-# until we properly start /etc/rcS.d
-mkdir -p /run/lock /run/shm
-chmod 1777 /run/lock /run/shm
-
echo .
diff --git a/debian/patches/run.patch b/debian/patches/run.patch
new file mode 100644
index 00000000..d1429c94
--- /dev/null
+++ b/debian/patches/run.patch
@@ -0,0 +1,16 @@
+Index: hurd/daemons/runsystem.sh
+===================================================================
+--- hurd.orig/daemons/runsystem.sh 2011-12-06 01:30:23.371425299 +0100
++++ hurd/daemons/runsystem.sh 2011-12-06 01:31:42.029647704 +0100
+@@ -61,6 +61,11 @@ if ! test -e /servers/socket/1 && which
+ settrans -c /servers/socket/1 /hurd/pflocal
+ fi
+
++# until we properly start /etc/rcS.d
++rm -fr /run/*
++mkdir -p /run/lock /run/shm
++chmod 1777 /run/lock /run/shm
++
+ # We expect to be started by console-run, which gives us no arguments and
+ # puts FALLBACK_CONSOLE=file-name in the environment if our console is
+ # other than a normal /dev/console.
diff --git a/debian/patches/series b/debian/patches/series
index 321e16cd..1474ac43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ libpthread_globsigdisp.patch
posix-sigcodes.patch
random-default-fast.patch
libexec.patch
+run.patch