From c2f4cfda4fc87d85bd6d1d3f6e392e79b17baf98 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Fri, 25 Oct 2013 22:51:13 -0700 Subject: [PATCH] Fix ppa support in ubuntu installs 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 --- boxes/build-ubuntu-box.sh | 2 +- boxes/common/install-salt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boxes/build-ubuntu-box.sh b/boxes/build-ubuntu-box.sh index dd72def..8ab5526 100755 --- a/boxes/build-ubuntu-box.sh +++ b/boxes/build-ubuntu-box.sh @@ -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 diff --git a/boxes/common/install-salt b/boxes/common/install-salt index 701f99e..6a3446f 100755 --- a/boxes/common/install-salt +++ b/boxes/common/install-salt @@ -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