summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2016-05-10 22:53:23 +0300
committerThomas Backlund <tmb@mageia.org>2016-05-10 22:53:23 +0300
commitb4c326b5bd2c3f34f38f6b2c1777512fd69d2da7 (patch)
tree3b7be9f6f494dccf3d47e3fdfa1925436946ccd5
parentf962c4ca57e83a513ca1f45f639c0a85ebec32e7 (diff)
downloaddrakx-b4c326b5bd2c3f34f38f6b2c1777512fd69d2da7.tar
drakx-b4c326b5bd2c3f34f38f6b2c1777512fd69d2da7.tar.gz
drakx-b4c326b5bd2c3f34f38f6b2c1777512fd69d2da7.tar.bz2
drakx-b4c326b5bd2c3f34f38f6b2c1777512fd69d2da7.tar.xz
drakx-b4c326b5bd2c3f34f38f6b2c1777512fd69d2da7.zip
Revert "switch back to arch dependant for isolinux.bin (mga#17771)"
This reverts commit 2261d82163ebf43ca8f90d571ef6222f3a7b0192. Already reverted in SVN
-rwxr-xr-ximages/make_boot_img5
1 files changed, 1 insertions, 4 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index 32f9cab37..d4cda303a 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -14,10 +14,7 @@ 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-i586.bin';
-if ($arch eq 'x86_64') {
- $isolinux_bin = '/usr/lib/syslinux/isolinux-x86_64.bin';
-}
+my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin';
my $tmp_mnt = '/tmp/drakx_mnt';