diff options
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi.sh')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 706418fa9c..f946d971d1 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -244,10 +244,9 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then | |||
244 | sed -i "/initrd /d" $GRUBCFG | 244 | sed -i "/initrd /d" $GRUBCFG |
245 | # Delete any LABEL= strings | 245 | # Delete any LABEL= strings |
246 | sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG | 246 | sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG |
247 | # Delete any root= strings | 247 | # Replace root= and add additional standard boot options |
248 | sed -i "s/ root=[^ ]*/ /g" $GRUBCFG | 248 | # We use root as a sentinel value, as vmlinuz is no longer guaranteed |
249 | # Add the root= and other standard boot options | 249 | sed -i "s/ root=[^ ]*/ root=PARTUUID=$root_part_uuid rw $rootwait quiet /g" $GRUBCFG |
250 | sed -i "s@linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw $rootwait quiet @" $GRUBCFG | ||
251 | fi | 250 | fi |
252 | 251 | ||
253 | if [ -d /run/media/$1/loader ]; then | 252 | if [ -d /run/media/$1/loader ]; then |
@@ -269,7 +268,13 @@ fi | |||
269 | 268 | ||
270 | umount /tgt_root | 269 | umount /tgt_root |
271 | 270 | ||
272 | cp /run/media/$1/vmlinuz /boot | 271 | # Copy kernel artifacts. To add more artifacts just add to types |
272 | # For now just support kernel types already being used by something in OE-core | ||
273 | for types in bzImage zImage vmlinux vmlinuz fitImage; do | ||
274 | for kernel in `find /run/media/$1/ -name $types*`; do | ||
275 | cp $kernel /boot | ||
276 | done | ||
277 | done | ||
273 | 278 | ||
274 | umount /boot | 279 | umount /boot |
275 | 280 | ||