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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-24 20:34:05 +0000 (Thu, 24 May 2007)
New Revision: 1725

Modified:
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-24 20:31:00 UTC (rev 1724)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-24 20:34:05 UTC (rev 1725)
@@ -116,7 +116,7 @@
 	then
 		if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 		then
-			wget --no-clobber -O "${DESTDIR}"/vmlinuzdi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
 			wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
 		else
 			wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
@@ -138,7 +138,7 @@
 		then
 			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 			then
-				wget --no-clobber -O "${DESTDIR}"/vmlinuzgi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+				wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
 				wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
 			else
 				mkdir -p "${DESTDIR}"/gtk

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-24 20:31:00 UTC (rev 1724)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-24 20:34:05 UTC (rev 1725)
@@ -243,10 +243,10 @@
 	then
 		if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
 		then
-			VMLINUZ_DI="vmlinuzdi"
+			VMLINUZ_DI="vmlinuz.di"
 			INITRD_DI="initrddi.gz"
 
-			VMLINUZ_GI="vmlinuzgi"
+			VMLINUZ_GI="vmlinuz.gi"
 			INITRD_GI="initrdgi.gz"
 		else
 			VMLINUZ_DI="vmlinuz"