From b7eb666eacf248b18b8ae578217d96b5a39c9c73 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Sun, 19 Sep 2010 16:37:05 +0200
Subject: openprotium: fixed unpack

recipe referred to checkroot.sh, file was named checkroot
without extension, renamed the file to checkroot.sh

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 .../initscripts-1.0/openprotium/checkroot          | 212 ---------------------
 .../initscripts-1.0/openprotium/checkroot.sh       | 212 +++++++++++++++++++++
 recipes/initscripts/initscripts-openprotium_1.0.bb |   2 +-
 3 files changed, 213 insertions(+), 213 deletions(-)
 delete mode 100755 recipes/initscripts/initscripts-1.0/openprotium/checkroot
 create mode 100755 recipes/initscripts/initscripts-1.0/openprotium/checkroot.sh

diff --git a/recipes/initscripts/initscripts-1.0/openprotium/checkroot b/recipes/initscripts/initscripts-1.0/openprotium/checkroot
deleted file mode 100755
index 6b63b07188..0000000000
--- a/recipes/initscripts/initscripts-1.0/openprotium/checkroot
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-# checkroot.sh	Check to root filesystem.
-#
-# Version:	@(#)checkroot.sh  2.84  25-Jan-2002  miquels@cistron.nl
-#
-
-. /etc/default/rcS
-
-#
-# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
-# from this script *before anything else* with a timeout, like SCO does.
-#
-test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
-
-#
-# Ensure that bdflush (update) is running before any major I/O is
-# performed (the following fsck is a good example of such activity :).
-#
-test -x /sbin/update && update
-
-#
-# Read /etc/fstab.
-#
-exec 9>&0 </etc/fstab
-rootmode=rw
-rootopts=rw
-test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no"
-swap_on_md=no
-devfs=
-while read fs mnt type opts dump pass junk
-do
-	case "$fs" in
-		""|\#*)
-			continue;
-			;;
-		/dev/md*)
-			# Swap on md device.
-			test "$type" = swap && swap_on_md=yes
-			;;
-		/dev/*)
-			;;
-		*)
-			# Might be a swapfile.
-			test "$type" = swap && swap_on_md=yes
-			;;
-	esac
-	
-	test "$type" = devfs && devfs="$fs"
-
-	# Currently we do not care about the other entries
-	if test "$mnt" = "/"
-	then
-		#echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]"
-
-		rootopts="$opts"		
-		roottype="$type"
-
-		#The "spinner" is broken on busybox sh	
-		TERM=dumb
-			
-		test "$pass" = 0 -o "$pass" = "" && rootcheck=no
-		
-		# Enable fsck for ext2 and ext3 rootfs, disable for everything else				
-		case "$type" in
-		ext2|ext3)	rootcheck=yes;;
-		*)		rootcheck=no;;
-		esac
-		
-		if test "$rootcheck" = yes
-		then
-			if ! test -x "/sbin/fsck.${roottype}"
-			then
-				echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n"
-				rootcheck=no
-			fi
-		fi
-		
-		case "$opts" in
-			ro|ro,*|*,ro|*,ro,*)
-				rootmode=ro
-				;;
-		esac
-	fi
-done
-exec 0>&9 9>&-
-
-#
-# Activate the swap device(s) in /etc/fstab. This needs to be done
-# before fsck, since fsck can be quite memory-hungry.
-#
-doswap=no
-test -d /proc/1 || mount -n /proc
-case "`uname -r`" in
-	2.[0123].*)
-		if test $swap_on_md = yes && grep -qs resync /proc/mdstat
-		then
-			test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing"
-		else
-			doswap=yes
-		fi
-		;;
-	*)
-		doswap=yes
-		;;
-esac
-if test $doswap = yes
-then
-	test "$VERBOSE" != no && echo "Activating swap"
-	swapon -a 2> /dev/null
-fi
-
-#
-# Check the root filesystem.
-#
-if test -f /fastboot || test $rootcheck = no
-then
-  test $rootcheck = yes && echo "Fast boot, no filesystem check"
-else
-  #
-  # Ensure that root is quiescent and read-only before fsck'ing.
-  #
-  mount -n -o remount,ro /
-  if test $? = 0
-  then
-    if test -f /forcefsck
-    then
-	force="-f"
-    else
-	force=""
-    fi
-    if test "$FSCKFIX" = yes
-    then
-	fix="-y"
-    else
-	fix="-a"
-    fi
-    spinner="-C"
-    case "$TERM" in
-        dumb|network|unknown|"") spinner="" ;;
-    esac
-    test `uname -m` = s390 && spinner="" # This should go away
-    test "$VERBOSE" != no && echo "Checking root filesystem..."
-    fsck $spinner $force $fix /
-    #
-    # If there was a failure, drop into single-user mode.
-    #
-    # NOTE: "failure" is defined as exiting with a return code of
-    # 2 or larger.  A return code of 1 indicates that filesystem
-    # errors were corrected but that the boot may proceed.
-    #
-    
-    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
-      # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot
-      # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal
-      chvt 1
-    
-      # 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. " 
-      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"
-      echo "and REBOOT the system."
-      echo
-      # Start a single user shell on the console
-      /sbin/sulogin $CONSOLE
-      reboot -f
-    fi
-  else
-    echo "*** ERROR!  Cannot fsck root fs because it is not mounted read-only!"
-    echo
-  fi
-fi
-
-devrootfound=$(grep "/dev/root" /proc/mounts | \
-        awk '{if ($4 = /rw/) print "found";}' )                                 
-
-if [ -n "$devrootfound" -a "$devrootfound" = "found" ]; then
-	echo "Read/write /dev/root found."            
-	exit 0                                                   
-fi
-
-if mount -vf -o remount / 2> /dev/null | \
-	awk '{if ($6 ~ /rw/) exit 0; else exit 1; }' && \
-	! touch -c / 2> /dev/null 
-	then
-		echo " Remounting root filesystem read/write"
-		mount -n -o remount,$rootmode /
-fi
-
-if test "$rootmode" = rw
-then
-	if test ! -L /etc/mtab
-	then
-		rm -f /etc/mtab~ /etc/nologin
-		: > /etc/mtab
-	fi
-	mount -f -o remount /
-	grep -q '^proc /proc' /etc/mtab || mount -f /proc
-	test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs"
-fi
-
-: exit 0
diff --git a/recipes/initscripts/initscripts-1.0/openprotium/checkroot.sh b/recipes/initscripts/initscripts-1.0/openprotium/checkroot.sh
new file mode 100755
index 0000000000..6b63b07188
--- /dev/null
+++ b/recipes/initscripts/initscripts-1.0/openprotium/checkroot.sh
@@ -0,0 +1,212 @@
+#
+# checkroot.sh	Check to root filesystem.
+#
+# Version:	@(#)checkroot.sh  2.84  25-Jan-2002  miquels@cistron.nl
+#
+
+. /etc/default/rcS
+
+#
+# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
+# from this script *before anything else* with a timeout, like SCO does.
+#
+test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
+
+#
+# Ensure that bdflush (update) is running before any major I/O is
+# performed (the following fsck is a good example of such activity :).
+#
+test -x /sbin/update && update
+
+#
+# Read /etc/fstab.
+#
+exec 9>&0 </etc/fstab
+rootmode=rw
+rootopts=rw
+test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no"
+swap_on_md=no
+devfs=
+while read fs mnt type opts dump pass junk
+do
+	case "$fs" in
+		""|\#*)
+			continue;
+			;;
+		/dev/md*)
+			# Swap on md device.
+			test "$type" = swap && swap_on_md=yes
+			;;
+		/dev/*)
+			;;
+		*)
+			# Might be a swapfile.
+			test "$type" = swap && swap_on_md=yes
+			;;
+	esac
+	
+	test "$type" = devfs && devfs="$fs"
+
+	# Currently we do not care about the other entries
+	if test "$mnt" = "/"
+	then
+		#echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]"
+
+		rootopts="$opts"		
+		roottype="$type"
+
+		#The "spinner" is broken on busybox sh	
+		TERM=dumb
+			
+		test "$pass" = 0 -o "$pass" = "" && rootcheck=no
+		
+		# Enable fsck for ext2 and ext3 rootfs, disable for everything else				
+		case "$type" in
+		ext2|ext3)	rootcheck=yes;;
+		*)		rootcheck=no;;
+		esac
+		
+		if test "$rootcheck" = yes
+		then
+			if ! test -x "/sbin/fsck.${roottype}"
+			then
+				echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n"
+				rootcheck=no
+			fi
+		fi
+		
+		case "$opts" in
+			ro|ro,*|*,ro|*,ro,*)
+				rootmode=ro
+				;;
+		esac
+	fi
+done
+exec 0>&9 9>&-
+
+#
+# Activate the swap device(s) in /etc/fstab. This needs to be done
+# before fsck, since fsck can be quite memory-hungry.
+#
+doswap=no
+test -d /proc/1 || mount -n /proc
+case "`uname -r`" in
+	2.[0123].*)
+		if test $swap_on_md = yes && grep -qs resync /proc/mdstat
+		then
+			test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing"
+		else
+			doswap=yes
+		fi
+		;;
+	*)
+		doswap=yes
+		;;
+esac
+if test $doswap = yes
+then
+	test "$VERBOSE" != no && echo "Activating swap"
+	swapon -a 2> /dev/null
+fi
+
+#
+# Check the root filesystem.
+#
+if test -f /fastboot || test $rootcheck = no
+then
+  test $rootcheck = yes && echo "Fast boot, no filesystem check"
+else
+  #
+  # Ensure that root is quiescent and read-only before fsck'ing.
+  #
+  mount -n -o remount,ro /
+  if test $? = 0
+  then
+    if test -f /forcefsck
+    then
+	force="-f"
+    else
+	force=""
+    fi
+    if test "$FSCKFIX" = yes
+    then
+	fix="-y"
+    else
+	fix="-a"
+    fi
+    spinner="-C"
+    case "$TERM" in
+        dumb|network|unknown|"") spinner="" ;;
+    esac
+    test `uname -m` = s390 && spinner="" # This should go away
+    test "$VERBOSE" != no && echo "Checking root filesystem..."
+    fsck $spinner $force $fix /
+    #
+    # If there was a failure, drop into single-user mode.
+    #
+    # NOTE: "failure" is defined as exiting with a return code of
+    # 2 or larger.  A return code of 1 indicates that filesystem
+    # errors were corrected but that the boot may proceed.
+    #
+    
+    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
+      # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot
+      # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal
+      chvt 1
+    
+      # 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. " 
+      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"
+      echo "and REBOOT the system."
+      echo
+      # Start a single user shell on the console
+      /sbin/sulogin $CONSOLE
+      reboot -f
+    fi
+  else
+    echo "*** ERROR!  Cannot fsck root fs because it is not mounted read-only!"
+    echo
+  fi
+fi
+
+devrootfound=$(grep "/dev/root" /proc/mounts | \
+        awk '{if ($4 = /rw/) print "found";}' )                                 
+
+if [ -n "$devrootfound" -a "$devrootfound" = "found" ]; then
+	echo "Read/write /dev/root found."            
+	exit 0                                                   
+fi
+
+if mount -vf -o remount / 2> /dev/null | \
+	awk '{if ($6 ~ /rw/) exit 0; else exit 1; }' && \
+	! touch -c / 2> /dev/null 
+	then
+		echo " Remounting root filesystem read/write"
+		mount -n -o remount,$rootmode /
+fi
+
+if test "$rootmode" = rw
+then
+	if test ! -L /etc/mtab
+	then
+		rm -f /etc/mtab~ /etc/nologin
+		: > /etc/mtab
+	fi
+	mount -f -o remount /
+	grep -q '^proc /proc' /etc/mtab || mount -f /proc
+	test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs"
+fi
+
+: exit 0
diff --git a/recipes/initscripts/initscripts-openprotium_1.0.bb b/recipes/initscripts/initscripts-openprotium_1.0.bb
index cb08741a35..67e24c227b 100644
--- a/recipes/initscripts/initscripts-openprotium_1.0.bb
+++ b/recipes/initscripts/initscripts-openprotium_1.0.bb
@@ -11,7 +11,7 @@ RCONFLICTS_${PN} = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.12"
+PR := "${PR}.13"
 
 FILESPATHPKG =. "${P}:initscripts-${PV}:"
 
-- 
cgit v1.2.3