diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-09-01 17:29:20 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-09-01 17:36:09 +0200 |
| commit | 05dc72c8231971429e6e22f0e6fdaeb89018a12b (patch) | |
| tree | 9c3622e1b7a0d8802cb4d930747d8487cf7b516f | |
| parent | 2d4ce0dda038b5618cfebfa0cbee6c86c71bc3f3 (diff) | |
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>
| -rw-r--r-- | packer/provision/basebuild.sh | 2 | ||||
| -rw-r--r-- | packer/templates/basebuild.json | 1 | ||||
| -rw-r--r-- | packer/vars/ubuntu-16.04.json | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 154d74e7..01445ff6 100644 --- 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 426f290a..cb103f4b 100644 --- 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 9ec7334d..aedec74d 100644 --- 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" } |