Adding live-package 0.99.12-1.

1 files changed, 37 insertions, 26 deletions

diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index dffa49018..f0ef328c5 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -54,33 +54,12 @@ Defaults ()
 	if [ -z "${LIVE_DISTRIBUTION}" ]
 	then
 		LIVE_DISTRIBUTION="testing"
-	else
-		case "${LIVE_DISTRIBUTION}" in
-			"${CODENAME_OLDSTABLE}")
-				LIVE_DISTRIBUTION="oldstable"
-				;;
-
-			"${CODENAME_STABLE}")
-				LIVE_DISTRIBUTION="stable"
-				;;
-
-			"${CODENAME_TESTING}")
-				LIVE_DISTRIBUTION="testing"
-				;;
-
-			"${CODENAME_UNSTABLE}")
-				LIVE_DISTRIBUTION="unstable"
-				;;
-
-			experimental)
-				LIVE_DISTRIBUTION="unstable"
-				LIVE_DISTRIBUTION_EXPERIMENTAL="yes"
-				;;
+	fi
 
-			*)
-				LIVE_DISTRIBUTION="unstable"
-				;;
-		esac
+	if [ "${LIVE_DISTRIBUTION}" = "experimental" ]
+	then
+		LIVE_DISTRIBUTION="unstable"
+		LIVE_DISTRIBUTION_EXPERIMENTAL="yes"
 	fi
 
 	# Set bootstrap flavour
@@ -161,6 +140,12 @@ Defaults ()
 		esac
 	fi
 
+	# Set kernel packages
+	if [ -z "${LIVE_KERNEL_PACKAGES}" ]
+	then
+		LIVE_KERNEL_PACKAGES="linux-image-2.6-${LIVE_KERNEL} squashfs-modules-2.6-${LIVE_KERNEL} unionfs-modules-2.6-${LIVE_KERNEL}"
+	fi
+
 	# Set debian mirror
 	if [ -z "${LIVE_MIRROR}" ]
 	then
@@ -194,6 +179,32 @@ Defaults ()
 		fi
 	fi
 
+	# Set FTP proxy
+	if [ -z "${LIVE_PROXY_FTP}" ] && [ -n "${ftp_proxy}" ]
+	then
+		LIVE_PROXY_FTP="${ftp_proxy}"
+		export LIVE_PROXY_FTP
+	else
+		if [ -n "${LIVE_PROXY_FTP}" ] && [ "${LIVE_PROXY_FTP}" != "${ftp_proxy}" ]
+		then
+			ftp_proxy="${LIVE_PROXY_FTP}"
+			export ftp_proxy
+		fi
+	fi
+
+	# Set HTTP proxy
+	if [ -z "${LIVE_PROXY_HTTP}" ] && [ -n "${http_proxy}" ]
+	then
+		LIVE_PROXY_HTTP="${http_proxy}"
+		export LIVE_PROXY_HTTP
+	else
+		if [ -n "${LIVE_PROXY_HTTP}" ] && [ "${LIVE_PROXY_HTTP}" != "${http_proxy}" ]
+		then
+			http_proxy="${LIVE_PROXY_HTTP}"
+			export http_proxy
+		fi
+	fi
+
 	# Set debian sections
 	if [ -z "${LIVE_SECTION}" ]
 	then