summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-420b1d848842cdf687b14e95f2c7f737d2745033.tar.gz
openembedded-core-420b1d848842cdf687b14e95f2c7f737d2745033.tar.bz2
openembedded-core-420b1d848842cdf687b14e95f2c7f737d2745033.tar.xz
openembedded-core-420b1d848842cdf687b14e95f2c7f737d2745033.zip
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 8226f543d..02697ce9b 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
#
# Read /etc/fstab.
#
-exec 9>&0 </etc/fstab
+exec 9< /etc/fstab
rootmode=rw
rootopts=rw
rootcheck=no
swap_on_md=no
devfs=
-while read fs mnt type opts dump pass junk
+while read fs mnt type opts dump pass junk <&9
do
case "$fs" in
""|\#*)
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 08a0f7806..129786a7e 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r120"
+PR = "r121"
SRC_URI = "file://functions \
file://halt \