From 420b1d848842cdf687b14e95f2c7f737d2745033 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 2 Jun 2010 11:45:59 +0100
Subject: initscripts: Tweak checkroot to work with recent versions of busybox

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/initscripts/initscripts-1.0/checkroot.sh | 4 ++--
 meta/packages/initscripts/initscripts_1.0.bb           | 2 +-
 2 files changed, 3 insertions(+), 3 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 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
 #
 # 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 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"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r120"
+PR = "r121"
 
 SRC_URI = "file://functions \
            file://halt \
-- 
cgit v1.2.3-54-g00ecf