summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-06-02 11:45:59 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-02 11:45:59 +0100
commit420b1d848842cdf687b14e95f2c7f737d2745033 (patch)
tree3891856dc8e43ed929989f8b725a190b627405d0
parent5b1c70256663128ca38553ad762c746e8f8e19df (diff)
downloadpoky-420b1d848842cdf687b14e95f2c7f737d2745033.tar.gz
initscripts: Tweak checkroot to work with recent versions of busybox
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-xmeta/packages/initscripts/initscripts-1.0/checkroot.sh4
-rw-r--r--meta/packages/initscripts/initscripts_1.0.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/initscripts/initscripts-1.0/checkroot.sh b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
index 8226f543dd..02697ce9bf 100755
--- a/meta/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -18,13 +18,13 @@ test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
18# 18#
19# Read /etc/fstab. 19# Read /etc/fstab.
20# 20#
21exec 9>&0 </etc/fstab 21exec 9< /etc/fstab
22rootmode=rw 22rootmode=rw
23rootopts=rw 23rootopts=rw
24rootcheck=no 24rootcheck=no
25swap_on_md=no 25swap_on_md=no
26devfs= 26devfs=
27while read fs mnt type opts dump pass junk 27while read fs mnt type opts dump pass junk <&9
28do 28do
29 case "$fs" in 29 case "$fs" in
30 ""|\#*) 30 ""|\#*)
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 08a0f7806f..129786a7e9 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
4DEPENDS = "makedevs" 4DEPENDS = "makedevs"
5RDEPENDS = "makedevs" 5RDEPENDS = "makedevs"
6LICENSE = "GPL" 6LICENSE = "GPL"
7PR = "r120" 7PR = "r121"
8 8
9SRC_URI = "file://functions \ 9SRC_URI = "file://functions \
10 file://halt \ 10 file://halt \