[oe-commits] Michael 'Mickey' Lauer : initscripts: fix remounting root partition when booting on a read-only mounted root partition

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5
Commit: 378ecdc5616699b88e4b405c20bbacc35e73bbfb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=378ecdc5616699b88e4b405c20bbacc35e73bbfb

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Feb 11 22:34:41 2009 +0000

initscripts: fix remounting root partition when booting on a read-only mounted root partition

---

 packages/initscripts/initscripts-1.0/checkroot.sh |    4 +---
 packages/initscripts/initscripts_1.0.bb           |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index e5aa9aa..8ad6262 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -21,7 +21,6 @@ test -x /sbin/update && update
 #
 # Read /etc/fstab.
 #
-exec 9>&0 </etc/fstab
 rootmode=rw
 rootopts=rw
 test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no"
@@ -81,8 +80,7 @@ do
 				;;
 		esac
 	fi
-done
-exec 0>&9 9>&-
+done < /etc/fstab
 
 #
 # Activate the swap device(s) in /etc/fstab. This needs to be done
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index ad3433a..133583b 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r111"
+PR = "r112"
 
 SRC_URI = "file://functions \
            file://halt \