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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-02 06:43:59 +0000 (Mon, 02 Jul 2007)
New Revision: 2345

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


Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-07-02 06:41:44 UTC (rev 2344)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-07-02 06:43:59 UTC (rev 2345)
@@ -39,18 +39,21 @@
  		DI_GTK="netboot/gtk/debian-installer/i386"
 		DI_KERNEL="linux"
 		;;
+
 	cdrom|enabled)
 		DI="cdrom"
 		DI_GTK="${DI}/gtk"
 		DI_KERNEL="vmlinuz"
 		;;
+
 	disabled)
 		exit 0
 		;;
-	*)  
+
+	*)
 		Echo_error "debian-installer flavor ${LIVE_DEBIAN_INSTALLER} not supported."
 		exit 1
-		;;    
+		;;
 esac
 
 Echo_message "Begin installing debian-installer..."
@@ -153,7 +156,7 @@
 			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/initrd.gz
 			;;
 	esac
-else    
+else
 	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
 	wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
 fi
@@ -192,17 +195,18 @@
 		amd64)
 			DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
 			;;
-	
+
 		i386)
 			DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 elilo lilo grub"
 			;;
-	
+
 		powerpc)
 			DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
 			;;
 	esac
+
 	DI_PACKAGES="${DI_PACKAGES} cryptsetup lvm2"
-    
+
 	Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
 	mv chroot/binary.deb ./
 	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status