Add dependencies to basebuild

Instead of calling agl_dependencies.sh through
cloud_user_data, we call it directly in the basebuild.json.

Change-Id: I00644835f77e581fe88717aeadfa7b67a4365983
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 154d74e..01445ff 100644 (file)
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -2,5 +2,3 @@
 # vim: set tw=4 sw=4 sts=4 et :
 
 # Presently nothing to do
-
-sed -i 's/ubuntu.mirror.vexxhost.com/us.archive.ubuntu.com/g' /etc/apt/sources.list

diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index 426f290..cb103f4 100644 (file)
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -44,6 +44,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/basebuild.sh",
+        "provision/agl_dependencies.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"

diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
index 9ec7334..aedec74 100644 (file)
--- a/packer/vars/ubuntu-16.04.json
+++ b/packer/vars/ubuntu-16.04.json
@@ -1,7 +1,7 @@
 {
-  "base_image": "Ubuntu 16.04 LTS (2016-06-10)",
+  "base_image": "Ubuntu 16.04 (2016-08-31) - LF upload",
   "cloud_user": "ubuntu",
 
   "distro": "Ubuntu 16.04",
-  "cloud_user_data": "provision/agl_dependencies.sh"
+  "cloud_user_data": "null_data"
 }