diff options
| author | Thomas Backlund <tmb@mageia.org> | 2016-12-22 18:57:10 +0200 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2016-12-22 18:57:10 +0200 |
| commit | 28ba5d2561fb982ccac1cc7bf10d4dc6298ecac2 (patch) | |
| tree | 665c1a6c97793378d1e51cc18e14e8d89d6b2579 | |
| parent | 04857303877f5655e4f771d5ea7ca107a4d2100d (diff) | |
| download | drakx-28ba5d2561fb982ccac1cc7bf10d4dc6298ecac2.tar drakx-28ba5d2561fb982ccac1cc7bf10d4dc6298ecac2.tar.gz drakx-28ba5d2561fb982ccac1cc7bf10d4dc6298ecac2.tar.bz2 drakx-28ba5d2561fb982ccac1cc7bf10d4dc6298ecac2.tar.xz drakx-28ba5d2561fb982ccac1cc7bf10d4dc6298ecac2.zip | |
Revert "add extra space b/c of build issue (mga#18316)"
This reverts commit fc255781e56bbddf3859e8941e4a3e93eee637fa.
| -rw-r--r-- | images/NEWS | 1 | ||||
| -rwxr-xr-x | images/make_boot_img | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/images/NEWS b/images/NEWS index 52f7b0a53..a19a739fb 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,5 +1,4 @@ - fix background theme image name (mga#19468) -- add extra space b/c of build issue (mga#18316) Version 2.39 - 8 September 2016 by Thierry Vignaud diff --git a/images/make_boot_img b/images/make_boot_img index 82cd9c27b..57afa3d39 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -358,7 +358,7 @@ sub boot_iso { _ "cp -r /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 + 32) * 1024 / 63) * 63; + my $efisize = ceil(ceil(chomp_(`du -s -k .boot_iso/EFI`) / 1024) * 1024 / 63) * 63; my $efi_img = ".boot_iso/isolinux/efiboot.img"; _ "/sbin/mkdosfs -F12 -C $efi_img $efisize"; _ "mcopy -s -i $efi_img .boot_iso/EFI ::"; |