summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2016-12-22 19:04:19 +0200
committerThomas Backlund <tmb@mageia.org>2016-12-22 19:04:19 +0200
commit39455fdf25697ef9640aa8ad7e6fedf0c3e59202 (patch)
tree4bcd0b2bb708b94fb95b9f08cd002a40659929b0 /images
parente0e32ed36786b25b5e3b3cb9fe08f06b1c739247 (diff)
downloaddrakx-39455fdf25697ef9640aa8ad7e6fedf0c3e59202.tar
drakx-39455fdf25697ef9640aa8ad7e6fedf0c3e59202.tar.gz
drakx-39455fdf25697ef9640aa8ad7e6fedf0c3e59202.tar.bz2
drakx-39455fdf25697ef9640aa8ad7e6fedf0c3e59202.tar.xz
drakx-39455fdf25697ef9640aa8ad7e6fedf0c3e59202.zip
copy efiboot.img from boot.iso to toplevel isolinux/ so it can be re-used with CI and live isos
Diffstat (limited to 'images')
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 4 insertions, 0 deletions
diff --git a/images/NEWS b/images/NEWS
index 199d1593d..1308cf5c6 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,6 +1,8 @@
- fix background theme image name (mga#19468)
- try to dereference symbolic links in order to fix image size
for FAT32 efiboot.img (mga#19323)
+- copy efiboot.img from boot.iso to toplevel isolinux/ so it can be
+ re-used with CI and live isos
Version 2.39 - 8 September 2016 by Thierry Vignaud
diff --git a/images/make_boot_img b/images/make_boot_img
index 39d544f09..dbc475722 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -362,6 +362,8 @@ sub boot_iso {
my $efi_img = ".boot_iso/isolinux/efiboot.img";
_ "/sbin/mkdosfs -F12 -C $efi_img $efisize";
_ "mcopy -s -i $efi_img .boot_iso/EFI ::";
+ # copy efiboot.img from boot.iso to toplevel isolinux/ so it can be re-used with CI and live isos
+ _ "cp -f .boot_iso/isolinux/efiboot.img isolinux/";
# create iso
_ "$cmd -eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot -o $iso .boot_iso";
_ "isohybrid -u $iso";