Skip to content

Commit 0200704

Browse files
author
Seth Thomas
authored
Merge pull request chef#969 from chef/revert-966-virtualbox-guest_additions_url
Revert "Added guest_additions_url as a user-variable for VirtualBox builds."
2 parents 0b139a7 + c4844e6 commit 0200704

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+0
-88
lines changed

‎centos/centos-6.9-i386.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"boot_wait": "10s",
88
"disk_size": "{{user `disk_size`}}",
99
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
10-
"guest_additions_url": "{{user `guest_additions_url`}}",
1110
"guest_os_type": "RedHat",
1211
"hard_drive_interface": "sata",
1312
"headless": "{{ user `headless` }}",
@@ -182,7 +181,6 @@
182181
}
183182
],
184183
"variables": {
185-
"guest_additions_url": "",
186184
"box_basename": "centos-6.9-i386",
187185
"build_timestamp": "{{isotime \"20060102150405\"}}",
188186
"cpus": "1",

‎centos/centos-6.9-x86_64.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"boot_wait": "10s",
88
"disk_size": "{{user `disk_size`}}",
99
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
10-
"guest_additions_url": "{{user `guest_additions_url`}}",
1110
"guest_os_type": "RedHat_64",
1211
"hard_drive_interface": "sata",
1312
"headless": "{{ user `headless` }}",
@@ -182,7 +181,6 @@
182181
}
183182
],
184183
"variables": {
185-
"guest_additions_url": "",
186184
"box_basename": "centos-6.9",
187185
"build_timestamp": "{{isotime \"20060102150405\"}}",
188186
"cpus": "1",

‎centos/centos-7.4-x86_64.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"boot_wait": "10s",
88
"disk_size": "{{user `disk_size`}}",
99
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
10-
"guest_additions_url": "{{user `guest_additions_url`}}",
1110
"guest_os_type": "RedHat_64",
1211
"hard_drive_interface": "sata",
1312
"headless": "{{ user `headless` }}",
@@ -182,7 +181,6 @@
182181
}
183182
],
184183
"variables": {
185-
"guest_additions_url": "",
186184
"box_basename": "centos-7.4",
187185
"build_timestamp": "{{isotime \"20060102150405\"}}",
188186
"cpus": "1",

‎debian/debian-7.11-amd64.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"boot_wait": "10s",
2222
"disk_size": "{{user `disk_size`}}",
2323
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
24-
"guest_additions_url": "{{user `guest_additions_url`}}",
2524
"guest_os_type": "Debian_64",
2625
"hard_drive_interface": "sata",
2726
"headless": "{{ user `headless` }}",
@@ -212,7 +211,6 @@
212211
}
213212
],
214213
"variables": {
215-
"guest_additions_url": "",
216214
"box_basename": "debian-7.11",
217215
"build_timestamp": "{{isotime \"20060102150405\"}}",
218216
"cpus": "1",

‎debian/debian-7.11-i386.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"boot_wait": "10s",
2222
"disk_size": "{{user `disk_size`}}",
2323
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
24-
"guest_additions_url": "{{user `guest_additions_url`}}",
2524
"guest_os_type": "Debian",
2625
"hard_drive_interface": "sata",
2726
"headless": "{{ user `headless` }}",
@@ -212,7 +211,6 @@
212211
}
213212
],
214213
"variables": {
215-
"guest_additions_url": "",
216214
"box_basename": "debian-7.11-i386",
217215
"build_timestamp": "{{isotime \"20060102150405\"}}",
218216
"cpus": "1",

‎debian/debian-8.10-amd64.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"boot_wait": "10s",
2323
"disk_size": "{{user `disk_size`}}",
2424
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
25-
"guest_additions_url": "{{user `guest_additions_url`}}",
2625
"guest_os_type": "Debian_64",
2726
"hard_drive_interface": "sata",
2827
"headless": "{{ user `headless` }}",
@@ -218,7 +217,6 @@
218217
}
219218
],
220219
"variables": {
221-
"guest_additions_url": "",
222220
"box_basename": "debian-8.10",
223221
"build_timestamp": "{{isotime \"20060102150405\"}}",
224222
"cpus": "1",

‎debian/debian-8.10-i386.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"boot_wait": "10s",
2323
"disk_size": "{{user `disk_size`}}",
2424
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
25-
"guest_additions_url": "{{user `guest_additions_url`}}",
2625
"guest_os_type": "Debian",
2726
"hard_drive_interface": "sata",
2827
"headless": "{{ user `headless` }}",
@@ -218,7 +217,6 @@
218217
}
219218
],
220219
"variables": {
221-
"guest_additions_url": "",
222220
"box_basename": "debian-8.10-i386",
223221
"build_timestamp": "{{isotime \"20060102150405\"}}",
224222
"cpus": "1",

‎debian/debian-9.3-amd64.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"boot_wait": "10s",
2323
"disk_size": "{{user `disk_size`}}",
2424
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
25-
"guest_additions_url": "{{user `guest_additions_url`}}",
2625
"guest_os_type": "Debian_64",
2726
"hard_drive_interface": "sata",
2827
"headless": "{{ user `headless` }}",
@@ -218,7 +217,6 @@
218217
}
219218
],
220219
"variables": {
221-
"guest_additions_url": "",
222220
"box_basename": "debian-9.3",
223221
"build_timestamp": "{{isotime \"20060102150405\"}}",
224222
"cpus": "1",

‎debian/debian-9.3-i386.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"boot_wait": "10s",
2323
"disk_size": "{{user `disk_size`}}",
2424
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
25-
"guest_additions_url": "{{user `guest_additions_url`}}",
2625
"guest_os_type": "Debian",
2726
"hard_drive_interface": "sata",
2827
"headless": "{{ user `headless` }}",
@@ -218,7 +217,6 @@
218217
}
219218
],
220219
"variables": {
221-
"guest_additions_url": "",
222220
"box_basename": "debian-9.3-i386",
223221
"build_timestamp": "{{isotime \"20060102150405\"}}",
224222
"cpus": "1",

‎fedora/fedora-26-x86_64.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"boot_wait": "10s",
88
"disk_size": "{{user `disk_size`}}",
99
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
10-
"guest_additions_url": "{{user `guest_additions_url`}}",
1110
"guest_os_type": "Fedora_64",
1211
"hard_drive_interface": "sata",
1312
"headless": "{{ user `headless` }}",
@@ -157,7 +156,6 @@
157156
}
158157
],
159158
"variables": {
160-
"guest_additions_url": "",
161159
"arch": "64",
162160
"box_basename": "fedora-26",
163161
"build_timestamp": "{{isotime \"20060102150405\"}}",

0 commit comments

Comments
 (0)