r2704 - dists/trunk/live-helper/functions

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-05 14:32:26 +0000 (Sun, 05 Aug 2007)
New Revision: 2704

Modified:
   dists/trunk/live-helper/functions/defaults.sh
Log:


Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-08-05 14:23:44 UTC (rev 2703)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-08-05 14:32:26 UTC (rev 2704)
@@ -47,7 +47,7 @@
 				;;
 
 			ubuntu)
-				LH_DISTRIBUTION="feisty"
+				LH_DISTRIBUTION="gutsy"
 				;;
 		esac
 	fi
@@ -84,8 +84,16 @@
 	# LH_APT_PIPELINE
 
 	# Setting apt recommends
-	LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
+	case "${LH_MODE}" in
+		debian-edu)
+			LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-disabled}"
+			;;
 
+		*)
+			LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
+			;;
+	esac
+
 	# Setting apt secure
 	LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
 
@@ -110,7 +118,7 @@
 				if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
 				then
 					LH_BOOTSTRAP="cdebootstrap"
-				elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/feisty ]
+				elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ]
 				then
 					LH_BOOTSTRAP="debootstrap"
 				else
@@ -159,12 +167,24 @@
 	# Setting initramfs hook
 	if [ -z "${LH_INITRAMFS}" ]
 	then
-		if [ "${LH_DISTRIBUTION}" = "etch" ]
-		then
-			LH_INITRAMFS="casper"
-		else
-			LH_INITRAMFS="live-initramfs"
-		fi
+		case "${LH_MODE}" in
+			debian)
+				if [ "${LH_DISTRIBUTION}" = "etch" ]
+				then
+					LH_INITRAMFS="casper"
+				else
+					LH_INITRAMFS="live-initramfs"
+				fi
+				;;
+
+			debian-edu)
+				LH_INITRAMFS="live-initramfs"
+				;;
+
+			ubuntu)
+				LH_INITRAMFS="live-initramfs"
+				;;
+		esac
 	fi
 
 	# Setting losetup
@@ -412,7 +432,11 @@
 	LH_INTERACTIVE="${LH_INTERACTIVE:-disabled}"
 
 	# Setting keyring packages
-	# LH_KEYRING_PACKAGES
+	case "${LH_MODE}" in
+		debian-edu)
+			LH_KEYRING_PACKAGES="debian-edu-archive-keyring"
+			;;
+	esac
 
 	# Setting language string
 	# LH_LANGUAGE