1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
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") {
|
