summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-10-06 07:11:34 +0000
committerThierry Vignaud <tv@mageia.org>2011-10-06 07:11:34 +0000
commit7c5cf3c4fe733ed7f312dacc4e93092cf6467bf7 (patch)
tree4adc4299e7ed8b07261dee54d977a38f089ecdf0
parentc61f813c3ff8095917f60b42abd9fe28b038d131 (diff)
downloaddrakx-7c5cf3c4fe733ed7f312dacc4e93092cf6467bf7.tar
drakx-7c5cf3c4fe733ed7f312dacc4e93092cf6467bf7.tar.gz
drakx-7c5cf3c4fe733ed7f312dacc4e93092cf6467bf7.tar.bz2
drakx-7c5cf3c4fe733ed7f312dacc4e93092cf6467bf7.tar.xz
drakx-7c5cf3c4fe733ed7f312dacc4e93092cf6467bf7.zip
fix isolinux.bin path with new syslinux
-rw-r--r--images/NEWS1
-rwxr-xr-ximages/make_boot_img2
2 files changed, 2 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index ee9cba659..e2d153b26 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,4 @@
+- fix isolinux.bin path with new syslinux
- use gfxboot.c32 as graphical boot loader
Version 1.55 - 22 August 2011 by Thierry Vignaud
diff --git a/images/make_boot_img b/images/make_boot_img
index d035457dc..c6bf57436 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -12,7 +12,7 @@ my $default_append = '';
my $default_acpi = '';
my $default_vga = "vga=788 splash=silent";
my $timeout = 150;
-my $isolinux_bin = $arch eq 'x86_64' ? '/usr/lib/syslinux/isolinux-x86_64.bin' : '/usr/lib/syslinux/isolinux-i586.bin';
+my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin';
my $lib = $arch eq 'x86_64' ? 'lib64' : 'lib';
my $tmp_mnt = '/tmp/drakx_mnt';