diff options
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | images/NEWS | 4 | ||||
| -rwxr-xr-x | images/make_boot_img | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile index 76d3c4028..5dfee9379 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.31 +VERSION=2.32 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/4.*) diff --git a/images/NEWS b/images/NEWS index 43e42d1f1..0fac7418c 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,7 @@ +Version 2.32 - 21 Feb 2016 by Anne Nicolas + +- back to arch dependant isolinux.bin (mga#17771) + Version 2.31 - 10 Jan 2016 by Thomas Backlund - psmouse is now modular, so add it to list_modules.pm (mga#17470) diff --git a/images/make_boot_img b/images/make_boot_img index 2e5dc428d..678b3ae37 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -14,7 +14,10 @@ my $default_acpi = ''; my $default_vga = "vga=788 splash quiet"; my $default_iswmd = "noiswmd"; my $timeout = $ENV{BOOT_AUTOMATIC_METHOD} ? 5 : 150; -my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin'; +my $isolinux_bin = '/usr/lib/syslinux/isolinux-i586.bin'; +if ($arch eq 'x86_64') { + $isolinux_bin = '/usr/lib/syslinux/isolinux-x86_64.bin'; +} my $tmp_mnt = '/tmp/drakx_mnt'; |