summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-20 21:49:27 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:24 +0100
commit64e9c9eb6ad6edc1fd39eef344f98beb60f91387 (patch)
tree4914c1144b9b78ebd2da0bfefbcee7270e13564b /scripts
parent799cb2abefdd20b875f33f78fbbfe9aa7a33fdaf (diff)
downloadlive-build-64e9c9eb6ad6edc1fd39eef344f98beb60f91387.zip
live-build-64e9c9eb6ad6edc1fd39eef344f98beb60f91387.tar.gz
Adding consle-setup and keyboard-configuration manually to package pool for debian-installer in order to workaround a flawed debian-installer change in squeeze.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_binary_debian-installer14
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 9913cfb..8c74d89 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -365,6 +365,20 @@ then
DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2"
+ case "${LB_MODE}" in
+ debian)
+ case "${LB_DISTRIBUTION}" in
+ lenny)
+ DI_PACKAGES="${DI_PACKAGES} console-setup"
+ ;;
+
+ *)
+ DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration"
+ ;;
+ esac
+ ;;
+ esac
+
# Set apt command prefix
_LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"