summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2013-02-01 08:51:39 +0100
committerDaniel Baumann <daniel@debian.org>2013-02-08 21:40:28 +0100
commitbc08ea011513d8ad15eed0fd218963438b90a444 (patch)
tree87956bee5a1304d31231e76b766e753f0793b685 /scripts
parent628c93f923da2a3693d8467517bb919cc1d5c591 (diff)
downloadvyos-live-build-bc08ea011513d8ad15eed0fd218963438b90a444.tar.gz
vyos-live-build-bc08ea011513d8ad15eed0fd218963438b90a444.zip
Updating syslinux configurations and handling for syslinux 5.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_syslinux6
1 files changed, 3 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)