[SCM] live-build branch, debian-next, updated. debian/3.0_a25-1-38-g6b63eff
Daniel Baumann
daniel at debian.org
Mon Jul 25 15:13:35 UTC 2011
The following commit has been merged in the debian-next branch:
commit 6b63effdff9ef0c4cb67282b4365cd98fd0586c8
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jul 25 17:15:17 2011 +0200
Using 'live' rather than 'incomplete' for cd_type in .disk on images that include debian-installer with live-installer udeb.
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index b1c4728..a7ddef2 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -124,14 +124,13 @@ case "${LB_DEBIAN_INSTALLER}" in
touch binary/.disk/base_installable
- echo "not_complete" > binary/.disk/cd_type
-
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
+ echo "live" > binary/.disk/cd_type
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
else
+ echo "not_complete" > binary/.disk/cd_type
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
-
fi
cp "${LB_BASE}"/data/debian-cd/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include binary/.disk/udeb_include
--
live-build
More information about the debian-live-changes
mailing list