|
|
@ -107,15 +107,18 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
addpkg=pciutils,build-essential,git-core,subversion,$LOCALE_PKG,wget,lsb-release
|
|
|
|
addpkg=pciutils,build-essential,git-core,subversion,$LOCALE_PKG,wget,lsb-release
|
|
|
|
|
|
|
|
|
|
|
|
KERNEL_PKG=linux-image-generic
|
|
|
|
if [ $DISTRO = "ubuntu" ]; then
|
|
|
|
if [ $DISTRO = "debian" ]; then
|
|
|
|
# Need comma at end to work around an issue with apt for Debian <= Squeeze regarding empty strings
|
|
|
|
KERNEL_PKG=
|
|
|
|
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744940
|
|
|
|
|
|
|
|
# http://anonscm.debian.org/cgit/apt/apt.git/commit/?h=1.0.3&id=d99854cac4065bc7b337815fb2116269d58dab73
|
|
|
|
|
|
|
|
KERNEL_PKG=linux-image-generic,
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if [ $LXC = "1" ]; then
|
|
|
|
if [ $LXC = "1" ]; then
|
|
|
|
addpkg=$addpkg,lxc
|
|
|
|
addpkg=$addpkg,lxc
|
|
|
|
else
|
|
|
|
else
|
|
|
|
addpkg=$addpkg,$KERNEL_PKG,grub-pc,openssh-server
|
|
|
|
# Lack of comma after KERNEL_PKG is not a typo
|
|
|
|
|
|
|
|
addpkg=$addpkg,${KERNEL_PKG}grub-pc,openssh-server
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# Remove cron to work around vmbuilder issue when umounting /dev on target
|
|
|
|
# Remove cron to work around vmbuilder issue when umounting /dev on target
|
|
|
|