summaryrefslogtreecommitdiff
path: root/debian/patches/0006-syslinux-path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0006-syslinux-path.patch')
-rw-r--r--debian/patches/0006-syslinux-path.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/debian/patches/0006-syslinux-path.patch b/debian/patches/0006-syslinux-path.patch
new file mode 100644
index 0000000..f240498
--- /dev/null
+++ b/debian/patches/0006-syslinux-path.patch
@@ -0,0 +1,75 @@
+From: Daniel Baumann <mail@daniel-baumann.ch>
+Date: Sun, 3 Jan 2021 02:06:39 -0800
+Subject: Updating syslinux paths (Closes: #682974).
+
+---
+ gfxboot | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/gfxboot b/gfxboot
+index f597c4f..c809762 100755
+--- a/gfxboot
++++ b/gfxboot
+@@ -989,9 +989,9 @@ my @vm_order = qw ( qemu64 qemu32 qemu qemu-kvm vbox vbox64 vboxsdl vmplayer vmw
+ my %bl_list = (
+ grub => '/usr/sbin/grub',
+ lilo => '/sbin/lilo',
+- isolinux => '/usr/share/syslinux/isolinux.bin',
++ isolinux => '/usr/lib/syslinux/isolinux.bin',
+ syslinux => '/usr/bin/syslinux',
+- pxelinux => '/usr/share/syslinux/pxelinux.0',
++ pxelinux => '/usr/lib/syslinux/pxelinux.0',
+ bd => '/usr/bin/bd',
+ bochs => '/usr/bin/bochs',
+ );
+@@ -1793,8 +1793,8 @@ sub prepare_isolinux
+ $arch_dir = 'i386';
+ $arch_dir = 'x86_64' if $opt_64 && !$opt_32;
+
+- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32";
+- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot;
++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32";
++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot;
+ $comboot = 0 unless -f $comboot;
+
+ # syslinux 6.x
+@@ -1867,7 +1867,7 @@ sub prepare_isolinux
+ close F;
+ }
+
+- system "cp $opt_syslinux/usr/share/syslinux/isolinux.bin $dst/$loader" and die "error: no isolinux\n";
++ system "cp $opt_syslinux/usr/lib/syslinux/isolinux.bin $dst/$loader" and die "error: no isolinux\n";
+ system "cp $comboot $dst/$loader" if $comboot;
+
+ for my $f ("ldlinux.c32", "libcom32.c32") {
+@@ -1917,8 +1917,8 @@ sub prepare_syslinux
+
+ die "error: syslinux not found\n" unless -f "$opt_syslinux/$bl_list{syslinux}";
+
+- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32";
+- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot;
++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32";
++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot;
+ $comboot = 0 unless -f $comboot;
+
+ # syslinux 6.x
+@@ -2034,8 +2034,8 @@ sub prepare_pxelinux
+ $arch_dir = 'i386';
+ $arch_dir = 'x86_64' if $opt_64 && !$opt_32;
+
+- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32";
+- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot;
++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32";
++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot;
+ $comboot = 0 unless -f $comboot;
+
+ # syslinux 6.x
+@@ -2108,7 +2108,7 @@ sub prepare_pxelinux
+ close F;
+ }
+
+- system "cp $opt_syslinux/usr/share/syslinux/pxelinux.0 $dst/$loader" and die "error: no pxelinux\n";
++ system "cp $opt_syslinux/usr/lib/syslinux/pxelinux.0 $dst/$loader" and die "error: no pxelinux\n";
+ system "cp $comboot $dst/$loader" if $comboot;
+
+ for my $f ("ldlinux.c32", "libcom32.c32") {