# # old_revision [59438d13db19ded8e22646fb8cddf849804f3a90]# # patch "packages/initscripts/initscripts-1.0/slugos/checkroot.sh"# from [6d5148cc28d75893b864c197dd83bf599a7e65e6]# to [0ba0411ddad15e9f1fa0d9279005ed70d03ab5bb]# # patch "packages/initscripts/initscripts-slugos_1.0.bb"# from [01a015b8a68429198cd2ec774be703c8af2d69d0]# to [bd866094ce1074fdfc8fcc0898cea906d4c5fbdc]# # patch "packages/slugos-init/files/functions"# from [9cbb038077dc9b04cd34b8709c30151943e35b42]# to [a1e9d3f9641fc0dbfabc14ae7603a8fc7ccbceea]# # patch "packages/slugos-init/slugos-init_0.10.bb"# from [cecefccb569049d150392aa328a8e0bd408c2d24]# to [351855938223d6903dc8ea2780ab659a3723e166]# # patch "packages/sysvinit/sysvinit/slugos/rcS-default"# from [585626e21cfbd39239063293c1bdb86a11eae113]# to [0844ac8b1992ebc9e5c6561dca54d9b74a04218b]# # patch "packages/sysvinit/sysvinit_2.86.bb"# from [239131d0142632adc66a19d6a78e2e6c2cdd2d00]# to [f99ecf12a697605059531f3416efd6040024d647]# ============================================================--- packages/initscripts/initscripts-1.0/slugos/checkroot.sh 6d5148cc28d75893b864c197dd83bf599a7e65e6+++ packages/initscripts/initscripts-1.0/slugos/checkroot.sh 0ba0411ddad15e9f1fa0d9279005ed70d03ab5bb@@ -79,6 +79,9 @@ if test -f /fastboot || test "$ROOTFSCK" != yes then test "$ROOTFSCK" = yes && echo "Fast boot, no filesystem check"+elif test ! -x /sbin/fsck -a ! -x /usr/sbin/fsck+then+ echo "/etc/init.d/checkroot.sh: no fsck" else leds disk-1 slow #@@ -128,8 +131,13 @@ leds system panic beep -r 5 # Start a single user shell on the console- /sbin/sulogin $CONSOLE- reboot -f+ if single_user_ok+ then+ sulogin $CONSOLE+ reboot -f+ else+ echo "/etc/init.d/checkroot.sh: fsck failed, continuing boot"+ fi fi else echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!"============================================================--- packages/initscripts/initscripts-slugos_1.0.bb 01a015b8a68429198cd2ec774be703c8af2d69d0+++ packages/initscripts/initscripts-slugos_1.0.bb bd866094ce1074fdfc8fcc0898cea906d4c5fbdc@@ -11,7 +11,7 @@ # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix-PR := "${PR}.6"+PR := "${PR}.7" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"============================================================--- packages/slugos-init/files/functions 9cbb038077dc9b04cd34b8709c30151943e35b42+++ packages/slugos-init/files/functions a1e9d3f9641fc0dbfabc14ae7603a8fc7ccbceea@@ -26,6 +26,20 @@ esac } #+# single_user_ok+# if the machine is capable of single user interaction return+# true, else return false. The result of this function is+# preempted by setting SULOGIN to 'yes' or 'ok' in /etc/default/rcS+single_user_ok() {+ # list known good machines in the 'case'+ test "$SULOGIN" = yes -o "$SULOGIN" = ok ||+ case "$(machine)" in+ ixdp*|avila|loft)+ return 0;;+ *) return 1;;+ esac+}+# # load_functions "source" # load the functions in '/sbin/source' - relies on /sbin/source being # a shell script and having support for this function.============================================================--- packages/slugos-init/slugos-init_0.10.bb cecefccb569049d150392aa328a8e0bd408c2d24+++ packages/slugos-init/slugos-init_0.10.bb 351855938223d6903dc8ea2780ab659a3723e166@@ -1,10 +1,10 @@ DESCRIPTION = "SlugOS initial network config via sysconf" SECTION = "base" PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio"-PR = "r54"+PR = "r55" SRC_URI = "file://boot/flash \ file://boot/disk \============================================================--- packages/sysvinit/sysvinit/slugos/rcS-default 585626e21cfbd39239063293c1bdb86a11eae113+++ packages/sysvinit/sysvinit/slugos/rcS-default 0844ac8b1992ebc9e5c6561dca54d9b74a04218b@@ -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 @@ # 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+# 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-ROOTFSCK=yes============================================================--- packages/sysvinit/sysvinit_2.86.bb 239131d0142632adc66a19d6a78e2e6c2cdd2d00+++ packages/sysvinit/sysvinit_2.86.bb f99ecf12a697605059531f3416efd6040024d647@@ -1,9 +1,9 @@ DESCRIPTION = "System-V like init." 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.