diff options
Diffstat (limited to 'yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh')
-rw-r--r-- | yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 0443a9d11..d58826a24 100644 --- a/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -120,7 +120,7 @@ if [ ! -e /etc/mtab ]; then cat /proc/mounts > /etc/mtab fi -disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") swap_size=$((disk_size*swap_ratio/100)) rootfs_size=$((disk_size-boot_size-swap_size)) @@ -217,7 +217,7 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then # Delete any LABEL= strings sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG # Delete any root= strings - sed -i "s/ root=[^ ]*/ /" $GRUBCFG + sed -i "s/ root=[^ ]*/ /g" $GRUBCFG # Add the root= and other standard boot options sed -i "s@linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw $rootwait quiet @" $GRUBCFG fi |