diff options
author | Ross Burton <ross.burton@intel.com> | 2013-07-25 16:31:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 13:09:15 +0100 |
commit | ec0e7f7fc70f23884dd1ebf3e7a82aeb4712859e (patch) | |
tree | b8e2d848927395c54295feed9e7843cc14294868 /meta | |
parent | f629afe1539c053cfdfb552f7623780567cc6b16 (diff) | |
download | poky-ec0e7f7fc70f23884dd1ebf3e7a82aeb4712859e.tar.gz |
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.
(From OE-Core rev: 4174dcbd3328e6badb269d09b024f2b83408bd8c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-live.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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() { | |||
157 | case $union_fs_type in | 157 | case $union_fs_type in |
158 | "overlayfs") | 158 | "overlayfs") |
159 | mkdir -p /rootfs.ro /rootfs.rw | 159 | mkdir -p /rootfs.ro /rootfs.rw |
160 | if ! mount -o ro,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then | 160 | if ! mount -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then |
161 | rm -rf /rootfs.ro /rootfs.rw | 161 | rm -rf /rootfs.ro /rootfs.rw |
162 | fatal "Could not mount rootfs image" | 162 | fatal "Could not mount rootfs image" |
163 | else | 163 | else |
@@ -170,7 +170,7 @@ mount_and_boot() { | |||
170 | ;; | 170 | ;; |
171 | "aufs") | 171 | "aufs") |
172 | mkdir -p /rootfs.ro /rootfs.rw | 172 | mkdir -p /rootfs.ro /rootfs.rw |
173 | if ! mount -o ro,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then | 173 | if ! mount -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE /rootfs.ro; then |
174 | rm -rf /rootfs.ro /rootfs.rw | 174 | rm -rf /rootfs.ro /rootfs.rw |
175 | fatal "Could not mount rootfs image" | 175 | fatal "Could not mount rootfs image" |
176 | else | 176 | else |
@@ -182,7 +182,7 @@ mount_and_boot() { | |||
182 | fi | 182 | fi |
183 | ;; | 183 | ;; |
184 | "") | 184 | "") |
185 | if ! mount -o ro,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then | 185 | if ! mount -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then |
186 | fatal "Could not mount rootfs image" | 186 | fatal "Could not mount rootfs image" |
187 | fi | 187 | fi |
188 | ;; | 188 | ;; |