Updating .disk/info generation when building iso images.

2 files changed, 58 insertions, 22 deletions

diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index 0fbd4268d..279da75ad 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -52,10 +52,19 @@ DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
 DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
 eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
 
-if [ "${LH_DISTRIBUTION}" != "etch" ]
-then
-	ARCHITECTURE="Snapshot ${ARCHITECTURE}"
-fi
+case "${LH_MODE}" in
+	debian)
+		STRING="Official Snapshot ${ARCHITECTURE}"
+		;;
+
+	debian-release)
+		STRING="Official ${ARCHITECTURE}"
+		;;
+
+	*)
+		STRING="Snapshot ${ARCHITECTURE}"
+		;;
+esac
 
 case "${LH_DEBIAN_INSTALLER}" in
 	cdrom)
@@ -65,7 +74,7 @@ case "${LH_DEBIAN_INSTALLER}" in
 
 		echo "full_cd" > binary/.disk/cd_type
 
-		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
 
 		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
 		;;
@@ -77,7 +86,13 @@ case "${LH_DEBIAN_INSTALLER}" in
 
 		echo "not_complete" > binary/.disk/cd_type
 
-		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+		if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+		then
+			echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+		else
+			echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+
+		fi
 
 		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
 
@@ -92,13 +107,13 @@ case "${LH_DEBIAN_INSTALLER}" in
 
 		echo "not_complete" > binary/.disk/cd_type
 
-		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
 
 		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
 		;;
 
 	disabled)
-		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
 		;;
 esac
 
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index e4b2d3d8d..f7e412926 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -44,24 +44,45 @@ Create_lockfile .lock
 
 mkdir -p source/.disk
 
-ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
 DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
 DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
 eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
 
-if [ -d binary/pool/main/b/base-installer ]
-then
-	if [ -d binary/pool/main/l/live-installer ]
-	then
-		TYPE="LIVE/INSTALL"
-	fi
-
-	TYPE="LIVE/NETINST"
-else
-	TYPE="LIVE"
-fi
-
-echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+case "${LH_MODE}" in
+	debian)
+		STRING="Official Snapshot"
+		;;
+
+	debian-release)
+		STRING="Official"
+		;;
+
+	*)
+		STRING="Snapshot"
+		;;
+esac
+
+case "${LH_DEBIAN_INSTALLER}" in
+	cdrom)
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	enabled|netinst)
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	live)
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	businesscard)
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	disabled)
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+esac
 
 # Creating stage file
 Create_stagefile .stage/source_disk