[oe-commits] org.oe.dev initscripts:

[coredump commit]

initscripts:  
 - Reformat some echo lines to be more readable on QVGA
 - echo RETURNCODE after fsck run
 - raise RETURNCODE for a FUBAR FS to -gt3

Author: coredump at openembedded.org
Branch: org.openembedded.dev
Revision: 82f9c4717828412775cfa3300d5c0d9214a22648
ViewMTN: http://monotone.openembedded.org/revision.psp?id=82f9c4717828412775cfa3300d5c0d9214a22648
Files:
1
packages/initscripts/initscripts-1.0/checkroot.sh
packages/initscripts/initscripts_1.0.bb
Diffs:

#
# mt diff -r6ebe656f2a8ca673808ff06fe2309e9c5d2a0810 -r82f9c4717828412775cfa3300d5c0d9214a22648
#
# 
# 
# patch "packages/initscripts/initscripts-1.0/checkroot.sh"
#  from [4c41ec97f3462115d1e3807efd8c86707c3c07df]
#    to [b95546d2e4021f8dbe1a23665f90f6f729fb68f5]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [70b455393600c733d6e4f70627bd504bd635caa6]
#    to [b20121d8d8378f0bf2f2e31d4fda257f0d4776d2]
# 
============================================================
--- packages/initscripts/initscripts-1.0/checkroot.sh	4c41ec97f3462115d1e3807efd8c86707c3c07df
+++ packages/initscripts/initscripts-1.0/checkroot.sh	b95546d2e4021f8dbe1a23665f90f6f729fb68f5
@@ -148,7 +148,10 @@ else
     # 2 or larger.  A return code of 1 indicates that filesystem
     # errors were corrected but that the boot may proceed.
     #
-    if test "$?" -gt 1
+    
+    echo "RETURNCODE: [$RTC]"
+    
+    if test "$RTC" -gt 3
     then
     
       # Since this script is run very early in the boot-process, it should be safe to assume that the
@@ -159,13 +162,14 @@ else
       # Surprise! Re-directing from a HERE document (as in
       # "cat << EOF") won't work, because the root is read-only.
       echo
-      echo "fsck failed.  Please repair manually and reboot.  Please note"
-      echo "that the root filesystem is currently mounted read-only.  To"
-      echo "remount it read-write:"
+      echo "fsck failed.  Please repair manually and reboot. " 
+      echo "Please note that the root filesystem is currently "
+      echo "mounted read-only.  To remount it read-write:"
       echo
       echo "   # mount -n -o remount,rw /"
       echo
-      echo "CONTROL-D will exit from this shell and REBOOT the system."
+      echo "CONTROL-D will exit from this shell"
+      echo "and REBOOT the system."
       echo
       # Start a single user shell on the console
       /sbin/sulogin $CONSOLE
============================================================
--- packages/initscripts/initscripts_1.0.bb	70b455393600c733d6e4f70627bd504bd635caa6
+++ packages/initscripts/initscripts_1.0.bb	b20121d8d8378f0bf2f2e31d4fda257f0d4776d2
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r82"
+PR = "r83"
 
 SRC_URI = "file://halt \
            file://ramdisk \