From 6b0a7968b4d6fa2ba0e0d38013e72826e78fbe72 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 25 Jun 2008 15:10:33 +0000
Subject: initscripts: remove obsolete tests

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4727 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../initscripts/initscripts-1.0/checkroot.sh       | 41 ++++++----------------
 1 file changed, 10 insertions(+), 31 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/initscripts/initscripts-1.0/checkroot.sh b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
index c96c7b88c..215b6de0a 100755
--- a/meta/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -1,8 +1,11 @@
-#
-# checkroot.sh	Check to root filesystem.
-#
-# Version:	@(#)checkroot.sh  2.84  25-Jan-2002  miquels@cistron.nl
-#
+### BEGIN INIT INFO
+# Provides:          checkroot
+# Required-Start:    udev sysfs
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Check to root file system.
+### END INIT INFO
 
 . /etc/default/rcS
 
@@ -12,12 +15,6 @@
 #
 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.
 #
@@ -60,26 +57,8 @@ 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
+test "$VERBOSE" != no && echo "Activating swap"
+swapon -a 2> /dev/null
 
 #
 # Check the root filesystem.
-- 
cgit v1.2.3