summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorCody A.W. Somerville <cody.somerville@canonical.com>2011-07-20 08:48:07 +0200
committerDaniel Baumann <daniel@debian.org>2011-07-20 08:48:07 +0200
commit651c8aebd2960123d14bf6715e3a0f149b2c9b98 (patch)
tree524efac9e186a271daa758f8d331c2adfc863b02 /scripts
parent31445ed7be72f77804cce0f71f03c802c04cc7bc (diff)
downloadvyos-live-build-651c8aebd2960123d14bf6715e3a0f149b2c9b98.tar.gz
vyos-live-build-651c8aebd2960123d14bf6715e3a0f149b2c9b98.zip
Updating lb_binary_linux-image to only copy over kernel and initrd if LB_LINUX_PACKAGES doesn't equal 'none'.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_binary_linux-image7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image
index 22e67612a..43e09a95d 100755
--- a/scripts/build/lb_binary_linux-image
+++ b/scripts/build/lb_binary_linux-image
@@ -73,8 +73,11 @@ Check_multiarchitectures
mkdir -p "${DESTDIR}"
# Installing linux-image
-cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
-cp chroot/boot/initrd.img-* "${DESTDIR}"
+if [ "${LB_LINUX_PACKAGES}" != "none" ]
+then
+ cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
+ cp chroot/boot/initrd.img-* "${DESTDIR}"
+fi
case "${LB_INITRAMFS}" in
live-boot)