diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-11-23 16:53:30 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-09 13:39:11 +0000 |
commit | 2dce2648e3d8c7c9d78a56d96be4401deccaa2f2 (patch) | |
tree | 05674a5b65771aa3c310269a58e585f8f3aeaee4 /scripts/contrib/mkefidisk.sh | |
parent | 41137c212cbc47e382dae5ce3de4f8217c2b5c4c (diff) | |
download | poky-2dce2648e3d8c7c9d78a56d96be4401deccaa2f2.tar.gz |
gummiboot: Remove/change gummiboot references with systemd-boot
After systemd-boot was introduced, its been tested for a while with no major
issues being found until now, this patch completely replaces all gummiboot
instances with systemd-boot ones, taking the next step into cleaning
up systemd-boot/gummiboot.
[YOCTO #10332]
(From OE-Core rev: f9a61d3400ad9068a6d83b8eb6aefe3098c58e68)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib/mkefidisk.sh')
-rwxr-xr-x | scripts/contrib/mkefidisk.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index a175895d81..800733f0af 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh | |||
@@ -384,7 +384,7 @@ EFIDIR="$BOOTFS_MNT/EFI/BOOT" | |||
384 | cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy vmlinuz" | 384 | cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy vmlinuz" |
385 | # Copy the efi loader and configs (booti*.efi and grub.cfg if it exists) | 385 | # Copy the efi loader and configs (booti*.efi and grub.cfg if it exists) |
386 | cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy EFI dir" | 386 | cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy EFI dir" |
387 | # Silently ignore a missing gummiboot loader dir (we might just be a GRUB image) | 387 | # Silently ignore a missing systemd-boot loader dir (we might just be a GRUB image) |
388 | cp -r $HDDIMG_MNT/loader $BOOTFS_MNT >$OUT 2>&1 | 388 | cp -r $HDDIMG_MNT/loader $BOOTFS_MNT >$OUT 2>&1 |
389 | 389 | ||
390 | # Update the boot loaders configurations for an installed image | 390 | # Update the boot loaders configurations for an installed image |
@@ -410,25 +410,25 @@ if [ -e "$GRUB_CFG" ]; then | |||
410 | sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $GRUB_CFG | 410 | sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $GRUB_CFG |
411 | fi | 411 | fi |
412 | 412 | ||
413 | # Look for a gummiboot installation | 413 | # Look for a systemd-boot installation |
414 | GUMMI_ENTRIES="$BOOTFS_MNT/loader/entries" | 414 | SYSTEMD_BOOT_ENTRIES="$BOOTFS_MNT/loader/entries" |
415 | GUMMI_CFG="$GUMMI_ENTRIES/boot.conf" | 415 | SYSTEMD_BOOT_CFG="$SYSTEMD_BOOT_ENTRIES/boot.conf" |
416 | if [ -d "$GUMMI_ENTRIES" ]; then | 416 | if [ -d "$SYSTEMD_BOOT_ENTRIES" ]; then |
417 | info "Configuring Gummiboot" | 417 | info "Configuring SystemD-boot" |
418 | # remove the install target if it exists | 418 | # remove the install target if it exists |
419 | rm $GUMMI_ENTRIES/install.conf >$OUT 2>&1 | 419 | rm $SYSTEMD_BOOT_ENTRIES/install.conf >$OUT 2>&1 |
420 | 420 | ||
421 | if [ ! -e "$GUMMI_CFG" ]; then | 421 | if [ ! -e "$SYSTEMD_BOOT_CFG" ]; then |
422 | echo "ERROR: $GUMMI_CFG not found" | 422 | echo "ERROR: $SYSTEMD_BOOT_CFG not found" |
423 | fi | 423 | fi |
424 | 424 | ||
425 | sed -i "/initrd /d" $GUMMI_CFG | 425 | sed -i "/initrd /d" $SYSTEMD_BOOT_CFG |
426 | sed -i "s@ root=[^ ]*@ @" $GUMMI_CFG | 426 | sed -i "s@ root=[^ ]*@ @" $SYSTEMD_BOOT_CFG |
427 | sed -i "s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $GUMMI_CFG | 427 | sed -i "s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $SYSTEMD_BOOT_CFG |
428 | fi | 428 | fi |
429 | 429 | ||
430 | # Ensure we have at least one EFI bootloader configured | 430 | # Ensure we have at least one EFI bootloader configured |
431 | if [ ! -e $GRUB_CFG ] && [ ! -e $GUMMI_CFG ]; then | 431 | if [ ! -e $GRUB_CFG ] && [ ! -e $SYSTEMD_BOOT_CFG ]; then |
432 | die "No EFI bootloader configuration found" | 432 | die "No EFI bootloader configuration found" |
433 | fi | 433 | fi |
434 | 434 | ||