diff options
| author | Brian Bloniarz <phunge0@hotmail.com> | 2009-07-02 22:10:36 -0400 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2009-07-03 11:12:55 +0100 |
| commit | 8c2db6479de9bc12e548e80a92b33ab81837b953 (patch) | |
| tree | 28f2efe18d7b09dd0fe02873c755ab3e09e68ae7 /recipes/initscripts | |
| parent | 0514bb1d469b25b42871175da2757102a3d75118 (diff) | |
initscripts: correct checkroot rootfs read-write check
initscripts: correct checkroot rootfs read-write check
Fixes a regexp typo when checking whether the rootfs needs
to be remounted. Also alters the remount logic to not
assume that the root will be mounted RW.
Signed-off-by: Brian Bloniarz <phunge0@hotmail.com>
recipes/initscripts/initscripts-1.0/checkroot | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
Diffstat (limited to 'recipes/initscripts')
| -rwxr-xr-x | recipes/initscripts/initscripts-1.0/checkroot | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes/initscripts/initscripts-1.0/checkroot b/recipes/initscripts/initscripts-1.0/checkroot index e5aa9aaf99..7ad00d09ad 100755 --- a/recipes/initscripts/initscripts-1.0/checkroot +++ b/recipes/initscripts/initscripts-1.0/checkroot @@ -182,6 +182,15 @@ else fi fi +ROOTFSDEV="/dev/root" +if ! grep -q "^$ROOTFSDEV\>" /proc/mounts; then + ROOTFSDEV="rootfs" +fi +if [ x$(grep "^$ROOTFSDEV\>" /proc/mounts | awk '{print $4}') = "x$rootmode" ]; then + echo "Root filesystem already $rootmode, not remounting" + exit 0 +fi + # # If the root filesystem was not marked as read-only in /etc/fstab, # remount the rootfs rw but do not try to change mtab because it @@ -189,15 +198,6 @@ fi # and finally write the new mtab. # This part is only needed if the rootfs was mounted ro. # -ROOTFSDEV="/dev/root" -if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then - ROOTFSDEV="rootfs" -fi -if [ x$(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = "xrw" ]; then - echo "Root filesystem already read-write, not remounting" - exit 0 -fi - echo "Remounting root file system..." mount -n -o remount,$rootmode / if test "$rootmode" = rw |