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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-14 17:39:03 +0000 (Sat, 14 Jul 2007)
New Revision: 2482

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-14 17:35:35 UTC (rev 2481)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-07-14 17:39:03 UTC (rev 2482)
@@ -34,13 +34,7 @@
 
 # Setting remote d-i directories
 case "${LIVE_DEBIAN_INSTALLER}" in
-	netboot)
-		DI="netboot/debian-installer/i386"
- 		DI_GTK="netboot/gtk/debian-installer/i386"
-		DI_KERNEL="linux"
-		;;
-
-	cdrom|enabled)
+	enabled|cdrom|live)
 		DI="cdrom"
 		DI_GTK="${DI}/gtk"
 		DI_KERNEL="vmlinuz"
@@ -50,6 +44,12 @@
 		exit 0
 		;;
 
+	netboot)
+		DI="netboot/debian-installer/i386"
+ 		DI_GTK="netboot/gtk/debian-installer/i386"
+		DI_KERNEL="linux"
+		;;
+
 	*)
 		Echo_error "debian-installer flavor ${LIVE_DEBIAN_INSTALLER} not supported."
 		exit 1
@@ -364,7 +364,7 @@
 
 # Excluding udebs
 grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs >> exclude
 grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
 
 for EXCLUDE in `cat exclude`