From 983378a2d3f3042997cbfb85683b238760bd9896 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 6 Feb 2006 01:22:22 +0000
Subject: initscripts-slugos: modify the slugos checkroot.sh not to hang on
 fsck failure in 1.0 slugos-init: add a single_user_ok function in
 /etc/default/functions in 0.10 sysvinit: update slugos rcS with new options
 in 2.86  - this is to fix the fsck of the rootfs so that it will actually
 work    safely on machines with no console.

---
 packages/sysvinit/sysvinit/slugos/rcS-default | 8 +++++++-
 packages/sysvinit/sysvinit_2.86.bb            | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'packages/sysvinit')

diff --git a/packages/sysvinit/sysvinit/slugos/rcS-default b/packages/sysvinit/sysvinit/slugos/rcS-default
index 4cb0e0c2f9..8bd6656cb5 100644
--- a/packages/sysvinit/sysvinit/slugos/rcS-default
+++ b/packages/sysvinit/sysvinit/slugos/rcS-default
@@ -5,6 +5,9 @@
 # Time files in /tmp are kept in days.
 TMPTIME=0
 # Set to yes if you want sulogin to be spawned on bootup
+# Set to ok if the machine supports SULOGIN, otherwise a
+# boot time failure will be ignored unless the system
+# is known to support a serial port
 SULOGIN=no
 # Set to no if you want to be able to login over telnet/rlogin
 # before system startup is complete (as soon as inetd is started)
@@ -21,4 +24,7 @@ FSCKFIX=yes
 # Set DOSWAP to "no" if you do not want all swap to automatically be mounted
 DOSWAP=yes
 # Set ROOTFSCK to "yes" to check the root fs automatically on boot
-ROOTFSCK=yes
+# WARNING: fsck for the file system must be installed and must work
+# before enabling this option, if not your system will drop to single
+# user (sulogin) if SULOGIN is set to yes or ok!
+ROOTFSCK=no
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 5a88eba4ab..d15afdfa23 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r21"
+PR = "r22"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
-- 
cgit v1.2.3