Added support for specifying the guest_additions_url as a variable to…

… all the json templates to allow the user to specify a custom VirtualBox Guest Additions ISO if necessary.
bt · Dec 31, 2017 · 375b90f · 375b90f
1 parent 5af0d4a
commit 375b90f
Show file tree

Hide file tree

Showing 44 changed files with 88 additions and 0 deletions.
diff --git a/centos/centos-6.9-i386.json b/centos/centos-6.9-i386.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "RedHat",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -181,6 +182,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "centos-6.9-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/centos/centos-6.9-x86_64.json b/centos/centos-6.9-x86_64.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "RedHat_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -181,6 +182,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "centos-6.9",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/centos/centos-7.4-x86_64.json b/centos/centos-7.4-x86_64.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "RedHat_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -181,6 +182,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "centos-7.4",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json
@@ -21,6 +21,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Debian_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -211,6 +212,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "debian-7.11",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json
@@ -21,6 +21,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Debian",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -211,6 +212,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "debian-7.11-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/debian/debian-8.10-amd64.json b/debian/debian-8.10-amd64.json
@@ -22,6 +22,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Debian_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -217,6 +218,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "debian-8.10",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/debian/debian-8.10-i386.json b/debian/debian-8.10-i386.json
@@ -22,6 +22,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Debian",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -217,6 +218,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "debian-8.10-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/debian/debian-9.3-amd64.json b/debian/debian-9.3-amd64.json
@@ -22,6 +22,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Debian_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -217,6 +218,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "debian-9.3",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/debian/debian-9.3-i386.json b/debian/debian-9.3-i386.json
@@ -22,6 +22,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Debian",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -217,6 +218,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "debian-9.3-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/fedora/fedora-26-x86_64.json b/fedora/fedora-26-x86_64.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Fedora_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -156,6 +157,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "arch": "64",
     "box_basename": "fedora-26",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/fedora/fedora-27-x86_64.json b/fedora/fedora-27-x86_64.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Fedora_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -156,6 +157,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "arch": "64",
     "box_basename": "fedora-27",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/freebsd/freebsd-10.3-amd64.json b/freebsd/freebsd-10.3-amd64.json
@@ -15,6 +15,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "FreeBSD_64",
       "headless": "{{ user `headless` }}",
       "http_directory": "http",
@@ -205,6 +206,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "freebsd-10.3",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/freebsd/freebsd-10.3-i386.json b/freebsd/freebsd-10.3-i386.json
@@ -15,6 +15,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "FreeBSD",
       "headless": "{{ user `headless` }}",
       "http_directory": "http",
@@ -205,6 +206,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "freebsd-10.3-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/freebsd/freebsd-10.4-amd64.json b/freebsd/freebsd-10.4-amd64.json
@@ -15,6 +15,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "FreeBSD_64",
       "headless": "{{ user `headless` }}",
       "http_directory": "http",
@@ -205,6 +206,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "freebsd-10.4",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/freebsd/freebsd-10.4-i386.json b/freebsd/freebsd-10.4-i386.json
@@ -15,6 +15,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "FreeBSD",
       "headless": "{{ user `headless` }}",
       "http_directory": "http",
@@ -205,6 +206,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "freebsd-10.4-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json
@@ -15,6 +15,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "FreeBSD_64",
       "headless": "{{ user `headless` }}",
       "http_directory": "http",
@@ -205,6 +206,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "box_basename": "freebsd-11.1",
     "build_timestamp": "{{isotime \"20060102150405\"}}",
     "cpus": "1",

diff --git a/macos/macos-10.12.json b/macos/macos-10.12.json
@@ -37,6 +37,7 @@
       "boot_wait": "2s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_mode": "disable",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "MacOS1011_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -223,6 +224,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md",
     "box_basename": "macos-10.12",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/macos/macosx-10.10.json b/macos/macosx-10.10.json
@@ -37,6 +37,7 @@
       "boot_wait": "2s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_mode": "disable",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "MacOS109_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -223,6 +224,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md",
     "box_basename": "macosx-10.10",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/macos/macosx-10.11.json b/macos/macosx-10.11.json
@@ -37,6 +37,7 @@
       "boot_wait": "2s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_mode": "disable",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "MacOS1011_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -223,6 +224,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md",
     "box_basename": "macosx-10.11",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/macos/macosx-10.9.json b/macos/macosx-10.9.json
@@ -37,6 +37,7 @@
       "boot_wait": "2s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_mode": "disable",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "MacOS109_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -223,6 +224,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "_README": "You must provide a prepared Mac disk image (from https://github.com/timsutton/osx-vm-templates) and checksum value for this template to work. For more details, consult this project's README.md",
     "box_basename": "macosx-10.9",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/opensuse/opensuse-leap-42.3-x86_64.json b/opensuse/opensuse-leap-42.3-x86_64.json
@@ -16,6 +16,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "OpenSUSE_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -186,6 +187,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "arch": "64",
     "autoinst_cfg": "autoinst.xml",
     "box_basename": "opensuse-leap-42.3",

diff --git a/oraclelinux/oracle-5.11-i386.json b/oraclelinux/oracle-5.11-i386.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Oracle",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -153,6 +154,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "arch": "32",
     "box_basename": "oracle-5.11-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/oraclelinux/oracle-5.11-x86_64.json b/oraclelinux/oracle-5.11-x86_64.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Oracle_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -159,6 +160,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "arch": "64",
     "box_basename": "oracle-5.11",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/oraclelinux/oracle-6.9-i386.json b/oraclelinux/oracle-6.9-i386.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Oracle",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -154,6 +155,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "arch": "32",
     "box_basename": "oracle-6.9-i386",
     "build_timestamp": "{{isotime \"20060102150405\"}}",

diff --git a/oraclelinux/oracle-6.9-x86_64.json b/oraclelinux/oracle-6.9-x86_64.json
@@ -7,6 +7,7 @@
       "boot_wait": "10s",
       "disk_size": "{{user `disk_size`}}",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
+      "guest_additions_url": "{{user `guest_additions_url`}}",
       "guest_os_type": "Oracle_64",
       "hard_drive_interface": "sata",
       "headless": "{{ user `headless` }}",
@@ -154,6 +155,7 @@
     }
   ],
   "variables": {
+    "guest_additions_url": "",
     "arch": "64",
     "box_basename": "oracle-6.9",
     "build_timestamp": "{{isotime \"20060102150405\"}}",