summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2016-02-21 23:53:02 +0100
committerAnne Nicolas <ennael@mageia.org>2016-02-21 23:53:02 +0100
commit2261d82163ebf43ca8f90d571ef6222f3a7b0192 (patch)
tree862124ff5744042be7ca252309040e54e2b8498f /images
parentb74655344ad6b7d81e363f31cc78885de2a208f1 (diff)
downloaddrakx-2261d82163ebf43ca8f90d571ef6222f3a7b0192.tar
drakx-2261d82163ebf43ca8f90d571ef6222f3a7b0192.tar.gz
drakx-2261d82163ebf43ca8f90d571ef6222f3a7b0192.tar.bz2
drakx-2261d82163ebf43ca8f90d571ef6222f3a7b0192.tar.xz
drakx-2261d82163ebf43ca8f90d571ef6222f3a7b0192.zip
switch back to arch dependant for isolinux.bin (mga#17771)
Diffstat (limited to 'images')
-rwxr-xr-ximages/make_boot_img5
1 files changed, 4 insertions, 1 deletions
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';