[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] initscripts: Disable rootcheck on Hurd
From: |
Justus Winter |
Subject: |
[PATCH 5/8] initscripts: Disable rootcheck on Hurd |
Date: |
Tue, 9 Jul 2013 10:46:48 +0200 |
The concept of device ids simply does not apply to the Hurd
system. Note that fsck is still run, rootcheck refers to the check
whether the root device in /etc/fstab matches the actual device.
---
debian/changelog | 2 ++
debian/src/initscripts/etc/init.d/checkroot.sh | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 743e77e..e77bd4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,8 @@ sysvinit (2.88dsf-42) UNRELEASED; urgency=low
* debian/control: Depend on a recent hurd package on hurd-any. The
initscripts require some functionality that has been implemented
only recently.
+ * checkroot.sh: Disable rootcheck on Hurd. The concept of device ids
+ simply does not apply to the Hurd system.
-- Roger Leigh <rleigh@debian.org> Sat, 04 May 2013 13:13:51 +0100
diff --git a/debian/src/initscripts/etc/init.d/checkroot.sh
b/debian/src/initscripts/etc/init.d/checkroot.sh
index 3bf506b..97c7e85 100755
--- a/debian/src/initscripts/etc/init.d/checkroot.sh
+++ b/debian/src/initscripts/etc/init.d/checkroot.sh
@@ -84,7 +84,10 @@ do_start () {
# If not we try to use the /dev/root alias device, and if that
# fails we create a temporary node in /run.
#
- if [ "$rootcheck" = yes ]
+ # Skip this on on Hurd. The concept of device ids simply does
+ # not apply to the Hurd system.
+ KERNEL="$(uname)"
+ if [ "$rootcheck" = yes ] && [ "$KERNEL" != GNU ]
then
ddev="$(mountpoint -qx $rootdev)"
rdev="$(mountpoint -d /)"
--
1.7.10.4
- patches for sysvinit, debian repository for testing, Justus Winter, 2013/07/09
- [PATCH 2/8] initscripts: add -ocompatible to procfs mounts on Hurd, Justus Winter, 2013/07/09
- [PATCH 1/8] initscripts: hurd has a proper tmpfs now, remove workaround, Justus Winter, 2013/07/09
- [PATCH 3/8] initscripts: use pidof -s /sbin/init for robustness, Justus Winter, 2013/07/09
- [PATCH 7/8] sendsigs, killprocs: Disable on Hurd. killall5 kills essential processes., Justus Winter, 2013/07/09
- [PATCH 4/8] initscripts: add runsystem.sysv, Justus Winter, 2013/07/09
- [PATCH 5/8] initscripts: Disable rootcheck on Hurd,
Justus Winter <=
- [PATCH 6/8] killall5.c: Use sysconf(_SC_SYMLOOP_MAX) instead of MAXSYMLINKS., Justus Winter, 2013/07/09
- [PATCH 8/8] sysvinit: Fix getty path in /etc/inittab on Hurd., Justus Winter, 2013/07/09
- Re: [PATCH 8/8] sysvinit: Fix getty path in /etc/inittab on Hurd., Pino Toscano, 2013/07/22
Re: patches for sysvinit, debian repository for testing, Samuel Thibault, 2013/07/15