diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-26 06:29:03 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <raphael@offensive-security.com> | 2020-04-23 09:59:56 +0200 |
| commit | 81adab855557a99d17110d9ffe5325cf774350d9 (patch) | |
| tree | 910635bdf46e42c9e7c02b3c9ba2531fe79fc122 | |
| parent | e5b2b56c7c9372c601216206fbfca9d023103e8c (diff) | |
| download | vyos-live-build-81adab855557a99d17110d9ffe5325cf774350d9.tar.gz vyos-live-build-81adab855557a99d17110d9ffe5325cf774350d9.zip | |
syslinux: simplification
`$_SOURCE` is always composed of `<foo>/${_BOOTLOADER}`, so we can just use
`${_BOOTLOADER}` as the basename, without calling `basename ${_SOURCE}`
Gbp-Dch: Ignore
| -rwxr-xr-x | scripts/build/binary_syslinux | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 72116e5ce..357267d14 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -114,9 +114,9 @@ case "${LB_BUILD_WITH_CHROOT}" in # Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly cp -a ${_SOURCE} chroot/root - Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp > /dev/null 2>&1 || true - cp -a chroot/root/$(basename ${_SOURCE}).tmp/* ${_TARGET} - rm -rf chroot/root/$(basename ${_SOURCE}) chroot/root/$(basename ${_SOURCE}).tmp + Chroot chroot cp -aL /root/${_BOOTLOADER} /root/${_BOOTLOADER}.tmp > /dev/null 2>&1 || true + cp -a chroot/root/${_BOOTLOADER}.tmp/* ${_TARGET} + rm -rf chroot/root/${_BOOTLOADER} chroot/root/${_BOOTLOADER}.tmp ;; false) |