[Debian-live-changes] r1169 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-25 16:44:31 +0000 (Wed, 25 Apr 2007)
New Revision: 1169

Modified:
   dists/trunk/live-helper/helpers/lh_binary_installer
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_installer	2007-04-25 16:37:36 UTC (rev 1168)
+++ dists/trunk/live-helper/helpers/lh_binary_installer	2007-04-25 16:44:31 UTC (rev 1169)
@@ -54,14 +54,17 @@
 case "${LIVE_BINARY_IMAGE}" in
 	iso)
 		DESTDIR="binary/install"
+		DESTDIR_INSTALLER="cdrom"
 		;;
 
 	net)
 		DESTDIR="tftpboot"
+		DESTDIR_INSTALLER="netboot"
 		;;
 
 	usb|hdd)
 		DESTDIR="binary"
+		DESTDIR_INSTALLER="hd-media"
 		;;
 esac
 
@@ -82,16 +85,16 @@
 # Downloading debian-installer
 mkdir -p "${DESTDIR}"
 
-wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/cdrom/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/cdrom/initrd.gz
+wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
 
 # Downloading graphical-installer
 if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
 then
 	mkdir -p "${DESTDIR}"/gtk
 
-	wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/cdrom/gtk/vmlinuz
-	wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/cdrom/gtk/initrd.gz
+	wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
 fi
 
 # Creating stage file