From 4174dcbd3328e6badb269d09b024f2b83408bd8c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 25 Jul 2013 16:31:40 +0100 Subject: Revert "initrdscripts: mount / as read-only when live-booting" My test environment must have been messed up as now hddimgs are failing to re-mount / as read-write. This reverts commit 7af92f8fa3a12fc8fcb22dbd12f87d89768b2d39. Signed-off-by: Ross Burton Signed-off-by: Saul Wold --- meta/recipes-core/initrdscripts/files/init-live.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/initrdscripts') diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index c56c79abc2..890c56280a 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -157,7 +157,7 @@ mount_and_boot() { case $union_fs_type in "overlayfs") mkdir -p /rootfs.ro /rootfs.rw - if ! mount -o ro,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then + if ! mount -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then rm -rf /rootfs.ro /rootfs.rw fatal "Could not mount rootfs image" else @@ -170,7 +170,7 @@ mount_and_boot() { ;; "aufs") mkdir -p /rootfs.ro /rootfs.rw - if ! mount -o ro,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then + if ! mount -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then rm -rf /rootfs.ro /rootfs.rw fatal "Could not mount rootfs image" else @@ -182,7 +182,7 @@ mount_and_boot() { fi ;; "") - if ! mount -o ro,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then + if ! mount -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then fatal "Could not mount rootfs image" fi ;; -- cgit 1.2.3-korg