summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-06-25 15:10:33 +0000
committerRoss Burton <ross@openedhand.com>2008-06-25 15:10:33 +0000
commit6b0a7968b4d6fa2ba0e0d38013e72826e78fbe72 (patch)
tree5947bbcb1926416e17d3aa93d2d7ab8a5faa6df8 /meta
parent6cd426013e1701845a03a42bfd45a45cc3f13c91 (diff)
downloadpoky-6b0a7968b4d6fa2ba0e0d38013e72826e78fbe72.tar.gz
initscripts: remove obsolete tests
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4727 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/packages/initscripts/initscripts-1.0/checkroot.sh41
1 files changed, 10 insertions, 31 deletions
diff --git a/meta/packages/initscripts/initscripts-1.0/checkroot.sh b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
index c96c7b88cb..215b6de0ad 100755
--- a/meta/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -1,8 +1,11 @@
1# 1### BEGIN INIT INFO
2# checkroot.sh Check to root filesystem. 2# Provides: checkroot
3# 3# Required-Start: udev sysfs
4# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl 4# Required-Stop:
5# 5# Default-Start: S
6# Default-Stop:
7# Short-Description: Check to root file system.
8### END INIT INFO
6 9
7. /etc/default/rcS 10. /etc/default/rcS
8 11
@@ -13,12 +16,6 @@
13test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE 16test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
14 17
15# 18#
16# Ensure that bdflush (update) is running before any major I/O is
17# performed (the following fsck is a good example of such activity :).
18#
19test -x /sbin/update && update
20
21#
22# Read /etc/fstab. 19# Read /etc/fstab.
23# 20#
24exec 9>&0 </etc/fstab 21exec 9>&0 </etc/fstab
@@ -60,26 +57,8 @@ exec 0>&9 9>&-
60# Activate the swap device(s) in /etc/fstab. This needs to be done 57# Activate the swap device(s) in /etc/fstab. This needs to be done
61# before fsck, since fsck can be quite memory-hungry. 58# before fsck, since fsck can be quite memory-hungry.
62# 59#
63doswap=no 60test "$VERBOSE" != no && echo "Activating swap"
64test -d /proc/1 || mount -n /proc 61swapon -a 2> /dev/null
65case "`uname -r`" in
66 2.[0123].*)
67 if test $swap_on_md = yes && grep -qs resync /proc/mdstat
68 then
69 test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing"
70 else
71 doswap=yes
72 fi
73 ;;
74 *)
75 doswap=yes
76 ;;
77esac
78if test $doswap = yes
79then
80 test "$VERBOSE" != no && echo "Activating swap"
81 swapon -a 2> /dev/null
82fi
83 62
84# 63#
85# Check the root filesystem. 64# Check the root filesystem.