diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-10 09:03:20 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-12 08:44:42 +0000 |
| commit | ff30da3ebb107421372e2a1a6d37f7c189667f2b (patch) | |
| tree | 7dcb10f555e74768f55029d644d16e636abb5420 /lib/MGA/DrakISO/BuildBoot.pm | |
| parent | 98ac027245772b49c24b1bbe35b0f33e6551c3e8 (diff) | |
| download | drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar.gz drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar.bz2 drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar.xz drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.zip | |
Simplify run_() helper function and minimise direct calls to system().
Diffstat (limited to 'lib/MGA/DrakISO/BuildBoot.pm')
| -rw-r--r-- | lib/MGA/DrakISO/BuildBoot.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm index c1097de..2572099 100644 --- a/lib/MGA/DrakISO/BuildBoot.pm +++ b/lib/MGA/DrakISO/BuildBoot.pm @@ -198,7 +198,7 @@ sub prepare_iso_bootloader { my $grub_cfg_template = $build->get_absolute_path($build->{media}{grub2_cfg}); -e $grub_cfg_template or die "ERROR: cannot find grub2 config file $grub_cfg_template\n"; cp_f($grub_cfg_template, $grub2_cfg); - run_("sed", "-i", "s/VOLUME_LABEL/$label/g", $grub2_cfg); + run_('sed', '-i', "s/VOLUME_LABEL/$label/g", $grub2_cfg); } else { output($grub2_cfg, build_grub2_cfg($build, $theme_name, \@theme_fonts, $add_lang_menu, $add_kbd_menu)); } @@ -253,8 +253,8 @@ sub prepare_iso_bootloader { # Construct an ESP image. This is needed for USB boot. my $esp_image = $images_dir . '/esp.img'; eval { rm_rf($esp_image) }; - run_("/sbin/mkdosfs", "-F12", "-C", $esp_image, "4096"); - run_("mcopy", "-s", "-i", $esp_image, $efi_root_dir, "::"); + run_('/sbin/mkdosfs', '-F12', '-C', $esp_image, '4096'); + run_('mcopy', '-s', '-i', $esp_image, $efi_root_dir, '::'); # Now we've built the ESP image, we can delete the grub2 image. We need # to leave the grub2.cfg file, as DVD boot sets the initial grub2 root |