[SCM] live-build branch, debian-next, updated. debian/3.0_a25-1-2-g330d067
Daniel Baumann
daniel at debian.org
Sat Jul 16 08:07:15 UTC 2011
The following commit has been merged in the debian-next branch:
commit 330d06708dd2e66005dfec01d74aa32cf1aa33dc
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jul 16 09:57:40 2011 +0200
Skipping binary_linux-image if no kernel was choosen to be installed deliberately, thanks to Adam Conrad <adconrad at ubuntu.com>.
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image
index cac19d8..22e6761 100755
--- a/scripts/build/lb_binary_linux-image
+++ b/scripts/build/lb_binary_linux-image
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LB_LINUX_PACKAGES}" = "none" ]
then
exit 0
fi
--
live-build
More information about the debian-live-changes
mailing list