aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-11 22:34:41 +0000
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-11 22:34:41 +0000
commit378ecdc5616699b88e4b405c20bbacc35e73bbfb (patch)
treef13d7bf9b83edbdd859ea9e3592ac19ee353293e
parentaa6fc517a2da14ca46edde6d74578179f5bc6a4a (diff)
downloadopenembedded-378ecdc5616699b88e4b405c20bbacc35e73bbfb.tar.gz
openembedded-378ecdc5616699b88e4b405c20bbacc35e73bbfb.tar.bz2
openembedded-378ecdc5616699b88e4b405c20bbacc35e73bbfb.zip
initscripts: fix remounting root partition when booting on a read-only mounted root partition
-rwxr-xr-xpackages/initscripts/initscripts-1.0/checkroot.sh4
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
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 e5aa9aaf99..8ad62622ff 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 ad3433a99c..133583bfdc 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 \