diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:35 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:35 +0200 |
| commit | 877d8dd14c0f97bf64db6ab21d23da98dd64fdd5 (patch) | |
| tree | 29568f319d862b3e47be3179f11170649b52bc20 /src/scripts/14chroot.sh | |
| parent | a194193638c1dfa55164fa318b5c8ab8f735d746 (diff) | |
| download | live-build-877d8dd14c0f97bf64db6ab21d23da98dd64fdd5.zip live-build-877d8dd14c0f97bf64db6ab21d23da98dd64fdd5.tar.gz | |
Adding live-package 0.99.12-1.
Diffstat (limited to 'src/scripts/14chroot.sh')
| -rw-r--r-- | src/scripts/14chroot.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index b650712..5b226e1 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -34,7 +34,7 @@ Chroot () Indices custom # Install secure apt - if [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "unstable" ] + if [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] || [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] then if [ "${LIVE_FLAVOUR}" != "minimal" ] then @@ -65,7 +65,7 @@ Chroot () Patch_linux apply # Install linux-image, modules and casper - Chroot_exec "apt-get install --yes --force-yes linux-image-2.6-${LIVE_KERNEL} squashfs-modules-2.6-${LIVE_KERNEL} unionfs-modules-2.6-${LIVE_KERNEL} casper" + Chroot_exec "apt-get install --yes --force-yes ${LIVE_KERNEL_PACKAGES} casper" # Deconfigure linux-image Patch_linux deapply @@ -159,16 +159,10 @@ Chroot () Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest-desktop fi - # Remove unused packages - Chroot_exec "apt-get remove --purge --yes cdebootstrap-helper-diverts" - # Clean apt packages cache rm -rf "${LIVE_CHROOT}"/var/cache/apt mkdir -p "${LIVE_CHROOT}"/var/cache/apt/archives/partial - # Remove cdebootstrap packages cache - rm -rf "${LIVE_CHROOT}"/var/cache/bootstrap - # Unmount proc umount "${LIVE_CHROOT}"/proc |