summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/00-defaults.sh7
-rw-r--r--scripts/01-chroot.sh23
-rw-r--r--scripts/01-patch.sh2
3 files changed, 23 insertions, 9 deletions
diff --git a/scripts/00-defaults.sh b/scripts/00-defaults.sh
index 32e5e13..4c2c3bd 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 5528d02..6d5d4ed 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 5b81bf5..c990032 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)