[SCM] Debian Live build scripts branch, master, updated. 1.0.1-3-13-g3d1b0f7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 24b8be738572a7d071473c11ab5c3f73d7ea6774
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 8 12:16:24 2008 +0100

    Removing debian-edu mode, outdated and apparently not used anymore.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 2841142..b0af603 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -24,10 +24,6 @@ Set_defaults ()
 			debian)
 				LH_DISTRIBUTION="lenny"
 				;;
-
-			debian-edu)
-				LH_DISTRIBUTION="etch"
-				;;
 		esac
 	fi
 
@@ -72,10 +68,6 @@ Set_defaults ()
 
 	# Setting apt recommends
 	case "${LH_MODE}" in
-		debian-edu)
-			LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-disabled}"
-			;;
-
 		*)
 			LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
 			;;
@@ -137,10 +129,6 @@ Set_defaults ()
 						LH_INITRAMFS="live-initramfs"
 					fi
 					;;
-
-				debian-edu)
-					LH_INITRAMFS="live-initramfs"
-					;;
 			esac
 		fi
 	fi
@@ -200,10 +188,6 @@ Set_defaults ()
 			debian)
 				LH_ROOT="debian-live"
 				;;
-
-			debian-edu)
-				LH_ROOT="edu-live"
-				;;
 		esac
 	fi
 
@@ -285,10 +269,6 @@ Set_defaults ()
 						;;
 				esac
 				;;
-
-			debian-edu)
-				LH_MIRROR_BOOTSTRAP="http://ftp.skolelinux.no/debian/"
-				;;
 		esac
 	fi
 
@@ -315,10 +295,6 @@ Set_defaults ()
 						;;
 				esac
 				;;
-
-			debian-edu)
-				LH_MIRROR_BINARY="http://ftp.skolelinux.no/debian/"
-				;;
 		esac
 	fi
 
@@ -360,8 +336,8 @@ Set_defaults ()
 
 	# Setting keyring packages
 	case "${LH_MODE}" in
-		debian-edu)
-			LH_KEYRING_PACKAGES="debian-edu-archive-keyring"
+		debian)
+			LH_KEYRING_PACKAGES="debian-archive-keyring"
 			;;
 	esac
 
@@ -636,10 +612,6 @@ Set_defaults ()
 			debian)
 				LH_ISO_APPLICATION="Debian Live"
 				;;
-
-			debian-edu)
-				LH_ISO_APPLICATION="Debian Edu Live"
-				;;
 		esac
 	fi
 
@@ -656,10 +628,6 @@ Set_defaults ()
 			debian)
 				LH_ISO_VOLUME="Debian Live \$(date +%Y%m%d-%H:%M)"
 				;;
-
-			debian-edu)
-				LH_ISO_VOLUME="Debian Edu Live \$(date +%Y%m%d-%H:%M)"
-				;;
 		esac
 	fi
 
@@ -687,10 +655,6 @@ Set_defaults ()
 			debian)
 				LH_NET_ROOT_PATH="/srv/debian-live"
 				;;
-
-			debian-edu)
-				LH_NET_ROOT_PATH="/srv/debian-edu-live"
-				;;
 		esac
 	fi
 

-- 
Debian Live build scripts