summaryrefslogtreecommitdiff
path: root/src/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripts')
-rw-r--r--src/scripts/02defaults.sh10
-rw-r--r--src/scripts/14chroot.sh17
2 files changed, 23 insertions, 4 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index aa26f76..83101fc 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 5132e8c..125f08f 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