summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Menut <lmenut@free.fr>2016-12-22 18:59:16 +0200
committerThomas Backlund <tmb@mageia.org>2016-12-22 18:59:16 +0200
commite0e32ed36786b25b5e3b3cb9fe08f06b1c739247 (patch)
tree164d6c9a5a66fa0f638f13e16effe8d89e2a6ec9
parent28ba5d2561fb982ccac1cc7bf10d4dc6298ecac2 (diff)
downloaddrakx-e0e32ed36786b25b5e3b3cb9fe08f06b1c739247.tar
drakx-e0e32ed36786b25b5e3b3cb9fe08f06b1c739247.tar.gz
drakx-e0e32ed36786b25b5e3b3cb9fe08f06b1c739247.tar.bz2
drakx-e0e32ed36786b25b5e3b3cb9fe08f06b1c739247.tar.xz
drakx-e0e32ed36786b25b5e3b3cb9fe08f06b1c739247.zip
- try to dereference symbolic links in order to fix image size
for FAT32 efiboot.img (mga#19323)
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 3 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index a19a739fb..199d1593d 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,6 @@
- fix background theme image name (mga#19468)
+- try to dereference symbolic links in order to fix image size
+ for FAT32 efiboot.img (mga#19323)
Version 2.39 - 8 September 2016 by Thierry Vignaud
diff --git a/images/make_boot_img b/images/make_boot_img
index 57afa3d39..39d544f09 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -355,7 +355,7 @@ sub boot_iso {
_ "sed -i 's#timeout=[0-9]*#timeout=1#' .boot_iso/EFI/BOOT/grub.cfg";
}
# add theme
- _ "cp -r /boot/grub2/{fonts,themes} .boot_iso/EFI/BOOT/";
+ _ "cp -r -L /boot/grub2/{fonts,themes} .boot_iso/EFI/BOOT/";
_ "cp -f grub2.theme .boot_iso/EFI/BOOT/themes/maggy/theme.txt";
# create efiboot.img, matching 63 cylinders from new dosfstools
my $efisize = ceil(ceil(chomp_(`du -s -k .boot_iso/EFI`) / 1024) * 1024 / 63) * 63;