diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MGA/DrakISO/BuildBoot.pm | 30 | ||||
| -rw-r--r-- | lib/MGA/DrakISO/BuildISO.pm | 10 |
2 files changed, 20 insertions, 20 deletions
diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm index 4191243..a778d79 100644 --- a/lib/MGA/DrakISO/BuildBoot.pm +++ b/lib/MGA/DrakISO/BuildBoot.pm @@ -20,7 +20,7 @@ # SYNOPSIS # -------- # This package provides a function to prepare the bootloader files that are -# needed to boot the ISO. Both MBR and UEFI boot are supported. It also +# needed to boot the ISO. Both MBR and EFI boot are supported. It also # provides a function to prepare the kernel and initrd files needed to boot # a Live system. @@ -181,7 +181,7 @@ sub prepare_iso_bootloader { cp_f(glob($messages . '/*.mo'), $locale_dir); } - # If the user has supplied a grub2 image for non-UEFI boot, copy that, + # If the user has supplied a grub2 image for non-EFI boot, copy that, # otherwise build one. my $eltorito_img = $build->get_absolute_path($build->{media}{eltorito_img}); if (defined $eltorito_img) { @@ -229,7 +229,7 @@ sub prepare_iso_bootloader { mkdir_p($efi_boot_dir); if ($efi_type ne '64bit') { - # If the user has supplied a grub2 image for 32-bit UEFI boot, copy that, + # If the user has supplied a grub2 image for 32-bit EFI boot, copy that, # otherwise build one. my $boot_efi = $build->get_absolute_path($build->{media}{boot32_efi}); if (defined $boot_efi) { @@ -241,7 +241,7 @@ sub prepare_iso_bootloader { } if ($efi_type ne '32bit') { - # If the user has supplied a grub2 image for 64-bit UEFI boot, copy that, + # If the user has supplied a grub2 image for 64-bit EFI boot, copy that, # otherwise build one. my $boot_efi = $build->get_absolute_path($build->{media}{boot64_efi}); if (defined $boot_efi) { @@ -252,17 +252,17 @@ sub prepare_iso_bootloader { } } - # Build a grub2 configuration file for UEFI boot. This just chains to the + # Build a grub2 configuration file for EFI boot. This just chains to the # main grub2 configuration file. - output($efi_boot_dir . '/grub.cfg', build_uefi_grub2_cfg($build)); + output($efi_boot_dir . '/grub.cfg', build_efi_grub2_cfg($build)); # If we have a theme, duplicate the theme configuration file and modify the - # title string to indicate we are doing a UEFI boot. This is useful when + # title string to indicate we are doing a EFI boot. This is useful when # dealing with user bug reports... if (-e $base_theme_txt) { - my $uefi_theme_txt = $grub2_dir . "/themes/$theme_name/theme-uefi.txt"; - cp_f($base_theme_txt, $uefi_theme_txt); - run_('sed', '-i', qq(s/title-text:.*/title-text: "$title ($mode UEFI)"/), $uefi_theme_txt); + my $efi_theme_txt = $grub2_dir . "/themes/$theme_name/theme-efi.txt"; + cp_f($base_theme_txt, $efi_theme_txt); + run_('sed', '-i', qq(s/title-text:.*/title-text: "$title ($mode EFI)"/), $efi_theme_txt); } # Create another build directory for temporarily storing the ESP image. @@ -331,8 +331,8 @@ sub build_grub2_cfg { " fi", if_($theme_name, "", - " if [ x\$uefi == 'xtrue' ] ; then", - " set theme=\$grub2/themes/$theme_name/theme-uefi.txt", + " if [ x\$efi == 'xtrue' ] ; then", + " set theme=\$grub2/themes/$theme_name/theme-efi.txt", " else", " set theme=\$grub2/themes/$theme_name/theme.txt", " fi", @@ -366,7 +366,7 @@ sub build_grub2_cfg { join("\n", if_($command eq 'linux16', - "if [ x\$uefi != 'xtrue' ] ; then", # UEFI doesn't support 16-bit + "if [ x\$efi != 'xtrue' ] ; then", # EFI doesn't support 16-bit ), "menuentry $gettext\"$name\" {", " $command $image " . join(' ', get_default_append($build), $append), @@ -478,13 +478,13 @@ sub build_kbd_menu_cfg { ); } -sub build_uefi_grub2_cfg { +sub build_efi_grub2_cfg { my ($build) = @_; join("\n", "search --no-floppy --set=root -l '" . $build->{media}{label} . "'", "set prefix=(\$root)/boot/grub2", "", - "set uefi=true", + "set efi=true", "", ". \$prefix/grub.cfg", "", diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm index 5ba55d0..7dc3667 100644 --- a/lib/MGA/DrakISO/BuildISO.pm +++ b/lib/MGA/DrakISO/BuildISO.pm @@ -64,10 +64,10 @@ sub build_iso { ); } -# This function builds a hybrid ISO capable of both legacy and UEFI boot. The +# This function builds a hybrid ISO capable of both legacy and EFI boot. The # ISO contains a primary iso9660 partition (which is the only thing visible # when booting from DVD) and a secondary ESP partition (which is only used -# for USB UEFI boot). +# for USB EFI boot). # # For legacy boot, the system boots the grub2 El Torito image. For DVD boot, # this is located via the El Torito catalogue. For USB boot, it is located @@ -75,7 +75,7 @@ sub build_iso { # cases the initial grub2 root location is the iso9660 partition, so the # initial grub2 configuration file will be read from that partition. # -# For UEFI boot, the system boots the grub2 EFI image. For DVD boot, this +# For EFI boot, the system boots the grub2 EFI image. For DVD boot, this # is located via the El Torito catalogue, and we store it in the iso9660 # partition. For USB boot, it must be located in the /EFI/BOOT directory # in the ESP. For DVD boot the initial grub2 root location is the iso9660 @@ -124,9 +124,9 @@ sub build_iso_image { '-boot-info-table', '--grub2-boot-info', if_($efi_type ne 'none', - # for DVD UEFI boot + # for DVD EFI boot '--efi-boot', '--interval:appended_partition_2:all::', - # for USB UEFI boot + # for USB EFI boot '-part_like_isohybrid', '-iso_mbr_part_type', '0x00', '-append_partition', 2, '0xef', $esp_image, |