[SCM] debian-live/live-helper branch, master, updated. 1.0_a27-1-22-gf197e47

[Daniel Baumann]

The branch, master has been updated
       via  f197e4787dc5974d8dd0c1d9709e30cb64dba2aa (commit)
       via  65bd75147deea57c0b0b890074a21238cc431a7d (commit)
      from  56019bbac5d8c52a3520b1c65da4c99402b7c423 (commit)


- Shortlog ------------------------------------------------------------
f197e47 helpers/lh_binary_debian-installer
65bd751 helpers/lh_binary_debian-installer

Summary of changes:
 helpers/lh_binary_debian-installer |   30 +++++++++++-------------------
 helpers/lh_binary_disk             |   12 ++++++------
 2 files changed, 17 insertions(+), 25 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit f197e4787dc5974d8dd0c1d9709e30cb64dba2aa
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 13 09:43:41 2007 +0200

    helpers/lh_binary_debian-installer
    
      * Simplifying debian-installer download.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 280dea0..3e2f9d8 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -184,29 +184,15 @@ fi
 
 # Downloading debian-installer
 mkdir -p "${DESTDIR_DI}"
-
-if [ "${LH_DISTRIBUTION}" = "sid" ]
-then
-	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
-	wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
-else
-	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
-	wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
-fi
+wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
+wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
 
 # Downloading graphical-installer
 if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
 then
 	mkdir -p "${DESTDIR_GI}"
-
-	if [ "${LH_DISTRIBUTION}" = "sid" ]
-	then
-		wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
-		wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
-	else
-		wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
-		wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/installer-"${LH_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz
-	fi
+	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
+	wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
 fi
 
 if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then

commit 65bd75147deea57c0b0b890074a21238cc431a7d
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 13 09:38:29 2007 +0200

    helpers/lh_binary_debian-installer
    helpers/lh_binary_disk
    
      * Adding support for live-installer.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 39cd0a1..280dea0 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -35,7 +35,7 @@ Set_defaults
 
 # Setting remote d-i directories
 case "${LH_DEBIAN_INSTALLER}" in
-	enabled|cdrom|netinst|businesscard)
+	enabled|cdrom|netinst|businesscard|live)
 		DI="cdrom"
 		DI_GTK="${DI}/gtk"
 		DI_KERNEL="vmlinuz"
@@ -381,6 +381,12 @@ do
 	rm -f "${EXCLUDE}"_*.udeb
 done
 
+# Enable live-installer
+if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+then
+	rm -f bootstrap-base_*.udeb
+fi
+
 # Moving udebs
 for UDEB in ${UDEBS}
 do
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index d742090..99d3117 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -79,7 +79,7 @@ case "${LH_MODE}" in
 				cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
 				;;
 
-			enabled|netinst)
+			enabled|netinst|live)
 				echo "main" > binary/.disk/base_components
 
 				touch binary/.disk/base_installable
@@ -89,6 +89,11 @@ case "${LH_MODE}" in
 				echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
 
 				cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
+
+				if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+				then
+					echo "live-installer" >> binary/.disk/udeb_include
+				fi
 				;;
 
 			businesscard)
@@ -114,10 +119,5 @@ case "${LH_MODE}" in
 		;;
 esac
 
-if [ -d binary/pool/main/l/live-installer ]
-then
-	echo "live-installer" >> binary/.disk/udeb_include
-fi
-
 # Creating stage file
 Create_stagefile .stage/binary_disk

-- 
debian-live/live-helper