Adding live-package 0.99.18-1.

4 files changed, 29 insertions, 10 deletions

diff --git a/src/config b/src/config
index 4eecb36dd..1b52a68b6 100644
--- a/src/config
+++ b/src/config
@@ -85,11 +85,11 @@ LIVE_REPOSITORY_KEYRING_edu="debian-edu-archive-keyring"
 LIVE_REPOSITORY_DISTRIBUTION_edu="etch-test"
 LIVE_REPOSITORY_SECTIONS_edu="local"
 
-LIVE_REPOSITORY_duo="http://ftp.debian-unofficial.org/debian/"
-LIVE_REPOSITORY_KEY_duo="http://ftp-master.debian-unofficial.org/key_2006.asc"
-LIVE_REPOSITORY_KEYRING_duo=""
-LIVE_REPOSITORY_DISTRIBUTION_duo=""
-LIVE_REPOSITORY_SECTIONS_duo="main contrib non-free restricted"
+LIVE_REPOSITORY_restricted="http://ftp.debian-unofficial.org/debian-restricted/"
+LIVE_REPOSITORY_KEY_restricted="http://ftp-master.debian-unofficial.org/key_2007.asc"
+LIVE_REPOSITORY_KEYRING_restricted=""
+LIVE_REPOSITORY_DISTRIBUTION_restricted=""
+LIVE_REPOSITORY_SECTIONS_restricted="restricted"
 
 LIVE_REPOSITORY_fai="http://www.informatik.uni-koeln.de/fai/download/"
 LIVE_REPOSITORY_KEY_fai=""
diff --git a/src/main.sh b/src/main.sh
index efaab542f..cb65d7d5d 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -28,7 +28,7 @@ set -e
 BASE=${LIVE_BASE:-"/usr/share/make-live"}
 CONFIG="/etc/make-live.conf"
 PROGRAM="`basename ${0}`"
-VERSION="0.99.17"
+VERSION="0.99.18"
 
 CODENAME_OLDSTABLE="woody"
 CODENAME_STABLE="sarge"
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index aa26f76fe..83101fc48 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -260,4 +260,14 @@ Defaults ()
 	then
 		LIVE_DISK_VOLUME="Debian Live `date +%Y%m%d`"
 	fi
+
+	if [ -z "${LIVE_DEBCONF_FRONTEND}" ]
+	then
+		LIVE_DEBCONF_FRONTEND="noninteractive"
+	fi
+
+	if [ -z "${LIVE_DEBCONF_PRIORITY}" ]
+	then
+		LIVE_DEBCONF_PRIORITY="critical"
+	fi
 }
diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh
index 5132e8c76..125f08f9f 100644
--- a/src/scripts/14chroot.sh
+++ b/src/scripts/14chroot.sh
@@ -12,7 +12,7 @@
 Chroot_exec ()
 {
 	# Execute commands chrooted
-	chroot "${LIVE_CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LIVE_PROXY_FTP}" http_proxy="${LIVE_PPROXY_HTTP}" DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" ${1}
+	chroot "${LIVE_CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LIVE_PROXY_FTP}" http_proxy="${LIVE_PPROXY_HTTP}" DEBIAN_FRONTEND="${LIVE_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LIVE_DEBCONF_PRIORITY}" ${1}
 	return ${?}
 }
 
@@ -152,7 +152,7 @@ EOF
 		if [ -r "${BASE}"/hooks/"${LIVE_FLAVOUR}" ]
 		then
 			grep -v "^#" "${BASE}"/hooks/"${LIVE_FLAVOUR}" > "${LIVE_CHROOT}"/root/"${LIVE_FLAVOUR}"
-			Chroot_exec "sh /root/${LIVE_FLAVOUR}"
+			LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" Chroot_exec "sh /root/${LIVE_FLAVOUR}"
 			rm -f "${LIVE_CHROOT}"/root/"${LIVE_FLAVOUR}"
 		fi
 
@@ -160,10 +160,10 @@ EOF
 		if [ -r "${LIVE_HOOK}" ]
 		then
 			# FIXME
-			Chroot_exec "`cat ${LIVE_HOOK}`"
+			LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" Chroot_exec "`cat ${LIVE_HOOK}`"
 		elif [ -n "${LIVE_HOOK}" ]
 		then
-			Chroot_exec "${LIVE_HOOK}"
+			LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" Chroot_exec "${LIVE_HOOK}"
 		fi
 
 		# Temporary hacks for broken packages
@@ -182,6 +182,15 @@ EOF
 		rm -rf "${LIVE_CHROOT}"/var/cache/apt
 		mkdir -p "${LIVE_CHROOT}"/var/cache/apt/archives/partial
 
+		if [ "${LIVE_FLAVOUR}" = "minimal" ]
+		then
+			rm -f "${LIVE_CHROOT}"/var/lib/apt/lists/*
+			rm -f "${LIVE_CHROOT}"/var/lib/dpkg/available-old
+			rm -f "${LIVE_CHROOT}"/var/lib/dpkg/diversions-old
+			rm -f "${LIVE_CHROOT}"/var/lib/dpkg/statoverride-old
+			rm -f "${LIVE_CHROOT}"/var/lib/dpkg/status-old
+		fi
+
 		# Workaround binfmt-support /proc locking
 		umount "${LIVE_CHROOT}"/proc/sys/fs/binfmt_misc > /dev/null || true