glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 2 Pull requests Packages Projects 1 Releases Wiki Activity

Fix ppa support in ubuntu installs

Browse source 
Rather than determining what package to install on which series, just install
them both for the time being as they don't seem to conflict in any current
series.

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
This commit is contained in:
Adam Stokes 2013-10-25 22:51:13 -07:00 committed by Fabio Rehm
parent 7ef475c7e1
commit c2f4cfda4f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boxes/build-ubuntu-box.sh
View file

@ -90,7 +90,7 @@ sed -i -e \
##################################################################################
# 4 - Add some goodies and update packages
PACKAGES=(vim curl wget man-db bash-completion)
PACKAGES=(vim curl wget man-db bash-completion python-software-properties software-properties-common)
chroot ${ROOTFS} apt-get install ${PACKAGES[*]} -y --force-yes
chroot ${ROOTFS} apt-get upgrade -y --force-yes

2
boxes/common/install-salt
View file

@ -5,7 +5,7 @@ set -e
rootfs=$1
echo "installing salt"
chroot $rootfs apt-get install python-software-properties -y --force-yes
chroot $rootfs apt-add-repository -y ppa:saltstack/salt
chroot $rootfs apt-get update
chroot $rootfs apt-get install salt-minion -y --force-yes