[SCM] live-build branch, debian-old-2.0, updated. a8eb93e487ba855064da81aaa7a473e337512233

Daniel Baumann daniel at debian.org
Mon Jul 25 15:51:19 UTC 2011


The following commit has been merged in the debian-old-2.0 branch:
commit a8eb93e487ba855064da81aaa7a473e337512233
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 fe68a7d..c976cd5 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -123,14 +123,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_DISTRIBUTION}/${LB_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include

-- 
live-build



More information about the debian-live-changes mailing list