From 18e4f460bf1c115c62ea9aebb56d75d486322531 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:21 +0200
Subject: Adding live-package 0.99.2-1.

---
 scripts/00-defaults.sh |  7 ++++++-
 scripts/01-chroot.sh   | 23 ++++++++++++++++-------
 scripts/01-patch.sh    |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/00-defaults.sh b/scripts/00-defaults.sh
index 32e5e13f5..4c2c3bd1a 100644
--- a/scripts/00-defaults.sh
+++ b/scripts/00-defaults.sh
@@ -43,7 +43,12 @@ Defaults ()
 				;;
 
 			amd64)
-				LIVE_LINUX="amd64-generic"
+				if [ "${LIVE_DISTRIBUTION}" == unstable ]
+				then
+					LIVE_LINUX="amd64-k8"
+				else
+					LIVE_LINUX="amd64-generic"
+				fi
 				;;
 
 			arm)
diff --git a/scripts/01-chroot.sh b/scripts/01-chroot.sh
index 5528d0237..6d5d4ed76 100644
--- a/scripts/01-chroot.sh
+++ b/scripts/01-chroot.sh
@@ -6,9 +6,7 @@ chroots ()
 	chroot "${LIVE_CHROOT}" /usr/bin/env -i HOME="/root" \
 		PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" \
 		ftp_proxy="${LIVE_FTPPROXY}" http_proxy="${LIVE_HTTPPROXY}" \
-		DEBIAN_PRIORITY="critical" ${1}
-	#DEBIAN_FRONTEND=non-interactive DEBIAN_PRIORITY=critical
-	# FIXME: setting DEBIAN_FRONTEND to non-interactive seems not to work.
+		DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical ${1}
 }
 
 Chroot ()
@@ -58,10 +56,21 @@ Chroot ()
 	Patch_linuximage apply
 
 	# Install linux-image
-	chroots "apt-get install --yes linux-image-2.6-${LIVE_LINUX}"
-	chroots "apt-get install --yes --force-yes casper \
-		squashfs-modules-2.6-${LIVE_LINUX} \
-		unionfs-modules-2.6-${LIVE_LINUX}"
+	case "${LIVE_DISTRIBUTION}" in
+		unstable)
+			chroots "apt-get install --yes linux-image-2.6-${LIVE_LINUX}"
+			chroots "apt-get install --yes --force-yes casper \
+				squashfs-modules-2.6-${LIVE_LINUX} \
+				unionfs-modules-2.6-${LIVE_LINUX}"
+			;;
+
+		testing)
+			chroots "apt-get install --yes linux-image-2.6.16-2-${LIVE_LINUX}"
+			chroots "apt-get install --yes --force-yes casper \
+				squashfs-modules-2.6.16-2-${LIVE_LINUX} \
+				unionfs-modules-2.6.16-2-${LIVE_LINUX}"
+			;;
+	esac
 
 	# Rebuild initial ramdisk
 	chroots "dpkg-reconfigure `basename ${LIVE_CHROOT}/var/lib/dpkg/info/linux-image-2.6.*-${LIVE_LINUX}.postinst .postinst`"
diff --git a/scripts/01-patch.sh b/scripts/01-patch.sh
index 5b81bf559..c990032d2 100644
--- a/scripts/01-patch.sh
+++ b/scripts/01-patch.sh
@@ -8,7 +8,7 @@ Patch_chroot ()
 	case "${1}" in
 		apply)
 			# Create chroot file
-			echo "live" > "${LIFE_CHROOT}"/etc/debian_chroot
+			echo "live" > "${LIVE_CHROOT}"/etc/debian_chroot
 			;;
 
 		deapply)
-- 
cgit v1.2.3