[SCM] live-build branch, debian, updated. debian/3.0_a39-1-7-g030436d
Daniel Baumann
daniel at debian.org
Sun Dec 4 09:16:28 UTC 2011
The following commit has been merged in the debian branch:
commit e57e3a2bace1f5a5c2f2a5f2115f22945fe5de80
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 29 16:28:17 2011 +0100
Creating progress specific disk info files in progress mode.
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index 8458320..96e2233 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -53,9 +53,9 @@ DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
-TITLE="Debian GNU/Linux"
case "${LB_MODE}" in
debian)
+ TITLE="Debian GNU/Linux"
STRING="Official Snapshot ${ARCHITECTURE}"
TRACE="project/trace/ftp-master.debian.org"
;;
@@ -72,7 +72,14 @@ case "${LB_MODE}" in
TRACE=""
;;
+ progress)
+ TITLE="Progress Linux"
+ STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
+ TRACE="project/trace/archive-master.progress-linux.org"
+ ;;
+
*)
+ TITLE="Debian GNU/Linux"
STRING="Snapshot ${ARCHITECTURE}"
TRACE=""
;;
diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk
index 6c8124a..c0811c9 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/lb_source_disk
@@ -49,13 +49,13 @@ Create_lockfile .lock
mkdir -p source/.disk
-TITLE="Debian GNU/Linux"
DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
case "${LB_MODE}" in
debian)
+ TITLE="Debian GNU/Linux"
STRING="Official Snapshot ${ARCHITECTURE}"
TRACE="project/trace/ftp-master.debian.org"
;;
@@ -72,7 +72,14 @@ case "${LB_MODE}" in
TRACE=""
;;
+ progress)
+ TITLE="Progress Linux"
+ STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
+ TRACE="project/trace/archive-master.progress-linux.org"
+ ;;
+
*)
+ TITLE="Debian GNU/Linux"
STRING="Snapshot ${ARCHITECTURE}"
TRACE=""
;;
--
live-build
More information about the debian-live-changes
mailing list