diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-02-01 08:51:39 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2013-02-08 21:40:28 +0100 |
| commit | bc08ea011513d8ad15eed0fd218963438b90a444 (patch) | |
| tree | 87956bee5a1304d31231e76b766e753f0793b685 | |
| parent | 628c93f923da2a3693d8467517bb919cc1d5c591 (diff) | |
| download | vyos-live-build-bc08ea011513d8ad15eed0fd218963438b90a444.tar.gz vyos-live-build-bc08ea011513d8ad15eed0fd218963438b90a444.zip | |
Updating syslinux configurations and handling for syslinux 5.
| -rwxr-xr-x | scripts/build/binary_syslinux | 6 | ||||
| l--------- | share/bootloaders/extlinux/ldlinux.c32 | 1 | ||||
| l--------- | share/bootloaders/extlinux/libcom32.c32 | 1 | ||||
| l--------- | share/bootloaders/extlinux/libutil.c32 | 1 | ||||
| l--------- | share/bootloaders/isolinux/ldlinux.c32 | 1 | ||||
| l--------- | share/bootloaders/isolinux/libcom32.c32 | 1 | ||||
| l--------- | share/bootloaders/isolinux/libutil.c32 | 1 | ||||
| l--------- | share/bootloaders/pxelinux/ldlinux.c32 | 1 | ||||
| l--------- | share/bootloaders/pxelinux/libcom32.c32 | 1 | ||||
| l--------- | share/bootloaders/pxelinux/libutil.c32 | 1 | ||||
| l--------- | share/bootloaders/syslinux/ldlinux.c32 | 1 | ||||
| l--------- | share/bootloaders/syslinux/libcom32.c32 | 1 | ||||
| l--------- | share/bootloaders/syslinux/libutil.c32 | 1 |
13 files changed, 15 insertions, 3 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 4b0fe18d8..7b7be2f09 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -179,10 +179,10 @@ case "${LB_BUILD_WITH_CHROOT}" in if [ "${LB_SYSLINUX_THEME}" = "live-build" ] then cp -a ${_SOURCE} chroot/root - Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp + Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp || true rm -rf chroot/$(basename ${_SOURCE}) else - Chroot chroot cp -aL ${_SOURCE} /root/$(basename ${_SOURCE}).tmp + Chroot chroot cp -aL ${_SOURCE} /root/$(basename ${_SOURCE}).tmp || true fi case "${LB_MODE}" in @@ -197,7 +197,7 @@ case "${LB_BUILD_WITH_CHROOT}" in false) mkdir -p ${_TARGET} - cp -aL ${_SOURCE}/* ${_TARGET} + cp -aL ${_SOURCE}/* ${_TARGET} || true case "${LB_MODE}" in ubuntu) diff --git a/share/bootloaders/extlinux/ldlinux.c32 b/share/bootloaders/extlinux/ldlinux.c32 new file mode 120000 index 000000000..c937af6a5 --- /dev/null +++ b/share/bootloaders/extlinux/ldlinux.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file diff --git a/share/bootloaders/extlinux/libcom32.c32 b/share/bootloaders/extlinux/libcom32.c32 new file mode 120000 index 000000000..bca5e3c27 --- /dev/null +++ b/share/bootloaders/extlinux/libcom32.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libcom32.c32
\ No newline at end of file diff --git a/share/bootloaders/extlinux/libutil.c32 b/share/bootloaders/extlinux/libutil.c32 new file mode 120000 index 000000000..351e12b3c --- /dev/null +++ b/share/bootloaders/extlinux/libutil.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libutil.c32
\ No newline at end of file diff --git a/share/bootloaders/isolinux/ldlinux.c32 b/share/bootloaders/isolinux/ldlinux.c32 new file mode 120000 index 000000000..c937af6a5 --- /dev/null +++ b/share/bootloaders/isolinux/ldlinux.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file diff --git a/share/bootloaders/isolinux/libcom32.c32 b/share/bootloaders/isolinux/libcom32.c32 new file mode 120000 index 000000000..bca5e3c27 --- /dev/null +++ b/share/bootloaders/isolinux/libcom32.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libcom32.c32
\ No newline at end of file diff --git a/share/bootloaders/isolinux/libutil.c32 b/share/bootloaders/isolinux/libutil.c32 new file mode 120000 index 000000000..351e12b3c --- /dev/null +++ b/share/bootloaders/isolinux/libutil.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libutil.c32
\ No newline at end of file diff --git a/share/bootloaders/pxelinux/ldlinux.c32 b/share/bootloaders/pxelinux/ldlinux.c32 new file mode 120000 index 000000000..c937af6a5 --- /dev/null +++ b/share/bootloaders/pxelinux/ldlinux.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file diff --git a/share/bootloaders/pxelinux/libcom32.c32 b/share/bootloaders/pxelinux/libcom32.c32 new file mode 120000 index 000000000..bca5e3c27 --- /dev/null +++ b/share/bootloaders/pxelinux/libcom32.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libcom32.c32
\ No newline at end of file diff --git a/share/bootloaders/pxelinux/libutil.c32 b/share/bootloaders/pxelinux/libutil.c32 new file mode 120000 index 000000000..351e12b3c --- /dev/null +++ b/share/bootloaders/pxelinux/libutil.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libutil.c32
\ No newline at end of file diff --git a/share/bootloaders/syslinux/ldlinux.c32 b/share/bootloaders/syslinux/ldlinux.c32 new file mode 120000 index 000000000..c937af6a5 --- /dev/null +++ b/share/bootloaders/syslinux/ldlinux.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file diff --git a/share/bootloaders/syslinux/libcom32.c32 b/share/bootloaders/syslinux/libcom32.c32 new file mode 120000 index 000000000..bca5e3c27 --- /dev/null +++ b/share/bootloaders/syslinux/libcom32.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libcom32.c32
\ No newline at end of file diff --git a/share/bootloaders/syslinux/libutil.c32 b/share/bootloaders/syslinux/libutil.c32 new file mode 120000 index 000000000..351e12b3c --- /dev/null +++ b/share/bootloaders/syslinux/libutil.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/libutil.c32
\ No newline at end of file |