summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-03-19 15:15:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 16:54:38 +0000
commit24cd3ddeb70a3d3f2985ec71c87ae0108f3d2777 (patch)
treeed2d583ad96608efc1c361a75b2cf7e46ead66d9
parentca67cd9334d9fe4fecfd5cffe24b19e03211b651 (diff)
downloadpoky-24cd3ddeb70a3d3f2985ec71c87ae0108f3d2777.tar.gz
mkefidisk: Boot with ro kernel parameter instead of rw
There is no need to boot with "rw". Booting with "ro" will allow for fsck to be run during boot, and a proper /etc/fstab will still ensure the rootfs is "rw" by the time the user can interact with the system. Change the "rw" to "ro" in the kernel parameters specified in the generated grub.cfg file. Fixes [YOCTO 4036] mkefidisk.sh hardcodes 'rw' as root mount option (From OE-Core rev: 960f0cbf85a4124adbc74d8b2ceb09a7d39ecc04) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/contrib/mkefidisk.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index c68c2249f3..9275ecf17c 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -253,7 +253,7 @@ sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
253# Replace the ramdisk root (if any) with the install device and include other 253# Replace the ramdisk root (if any) with the install device and include other
254# kernel parameters 254# kernel parameters
255sed -i "s@ root=[^ ]*@ @" $GRUBCFG 255sed -i "s@ root=[^ ]*@ @" $GRUBCFG
256sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS rw $ROOTWAIT quiet @" $GRUBCFG 256sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro $ROOTWAIT quiet @" $GRUBCFG
257 257
258# Provide a startup.nsh script for older firmware with non-standard boot 258# Provide a startup.nsh script for older firmware with non-standard boot
259# directories and paths. 259# directories and paths.