boxes 3.6.1 → 3.7.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 99e6d695e414125521acc7148c0e85489301461065b51f270edb32c537ce924d
4
- data.tar.gz: f8c91525640ea202ab9817298b982c502591e53b16fd1a4d35dc1bb3c8fb4dff
3
+ metadata.gz: 2e467377a668469709919be381ac4da37cb50ce2914b22d7d94afae40d4e084c
4
+ data.tar.gz: b62708cfaa698358e6411933c278bcdf4f392f5d666a9bb68ef72e0870ae4a37
5
5
  SHA512:
6
- metadata.gz: 03262de00b3ae3df81d7f99e8f75e2793babe11cae7550229a5632db1789c3aab59def3c9cba0b0b7222533b22bbdb20974164346d9ec5233af84da70273c760
7
- data.tar.gz: a238f86f78912b49242f88dfe4dc387be15de5c6c28b69e2231fa78940c686327f2efd55b1dc1372aa628bc18d0c86a96b025d4556fd347f06155d8a788f9aef
6
+ metadata.gz: 3d3a71731d23f25de57b6ff486517dc07d2efcd1925d0393469c9d40c71629eb20490ac697287e2c19529fa7514deec3f1bdba2e902ed9be3d705e9626fa64ae
7
+ data.tar.gz: 51488c7bda7f432ee37b51ce9f39372f48bd5a12a08dadd94bf7a4d4a14795678fbbe666d4ee0dc472961f6c5e6dc7e01cd0f9753e78151ece5188ef4b51aea8
@@ -1,5 +1,11 @@
1
1
  # CHANGELOG
2
2
 
3
+ ## 3.7.0 (19/08/2020)
4
+
5
+ * Support for Ubuntu 20.04 ([58])
6
+
7
+ [58]: https://github.com/nickcharlton/boxes/pull/58
8
+
3
9
  ## 3.6.1 (13/08/2020)
4
10
 
5
11
  * Update Debian Buster from 10.3.0 to 10.5.0
@@ -1,3 +1,3 @@
1
1
  module Boxes
2
- VERSION = "3.6.1".freeze
2
+ VERSION = "3.7.0".freeze
3
3
  end
@@ -4,6 +4,10 @@
4
4
  # Configure the relevant VM tools for this builder.
5
5
  ##
6
6
 
7
+ distribution=$(lsb_release -si)
8
+ version=$(lsb_release -sr)
9
+ major_version=$(echo "$version" | awk -F . '{print $1}')
10
+
7
11
  case $PACKER_BUILDER_TYPE in
8
12
  'virtualbox-iso')
9
13
  echo "Installing VirtualBox Guest Additions..."
@@ -15,17 +19,23 @@ case $PACKER_BUILDER_TYPE in
15
19
  rm -f /home/vagrant/VBoxGuestAdditions.iso
16
20
  ;;
17
21
  'vmware-iso')
18
- echo "Installing VMware Tools..."
19
- apt-get -qy install fuse
20
- mkdir -p /mnt/cdrom
21
- mount -o loop /home/vagrant/linux.iso /mnt/cdrom
22
+ if [ "$distribution" = 'Ubuntu' ]; then
23
+ if [ "$major_version" -le "19" ]; then
24
+ echo "Installing VMware Tools..."
25
+ apt-get -qy install fuse
26
+ mkdir -p /mnt/cdrom
27
+ mount -o loop /home/vagrant/linux.iso /mnt/cdrom
22
28
 
23
- cd /tmp
24
- tar -zxpf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
25
- /tmp/vmware-tools-distrib/vmware-install.pl --force-install --default
29
+ cd /tmp
30
+ tar -zxpf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
31
+ /tmp/vmware-tools-distrib/vmware-install.pl --force-install --default
26
32
 
27
- umount /mnt/cdrom
28
- rm -f /home/vagrant/linux.iso
33
+ umount /mnt/cdrom
34
+ rm -f /home/vagrant/linux.iso
35
+ else
36
+ echo "Skipping installing VMware Tools because open-vm-tools works..."
37
+ fi
38
+ fi
29
39
  ;;
30
40
  *)
31
41
  printf "Nothing to do for the %s builder type.\n" $PACKER_BUILDER_TYPE
@@ -0,0 +1,53 @@
1
+ {
2
+ "provisioners": [
3
+ {
4
+ "type": "shell",
5
+ "scripts": [
6
+ <%= ["postinstall.sh", "vmtools.sh", @scripts].flatten.map { |i| "\"scripts/#{i}\"" }.join(", ") %>
7
+ ],
8
+ "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -E -S bash '{{ .Path }}'"
9
+ }
10
+ ],
11
+
12
+ "builders": [
13
+ {
14
+ "name": "<%= @name %>",
15
+ "type": "<%= @provider %>-iso",
16
+ <%- if @provider == "vmware" -%>
17
+ "guest_os_type": "ubuntu-64",
18
+ "tools_upload_flavor": "linux",
19
+ <%- else -%>
20
+ "guest_os_type": "Ubuntu_64",
21
+ <%- end -%>
22
+ "headless": true,
23
+
24
+ "memory": 1024,
25
+
26
+ "iso_url": "http://releases.ubuntu.com/20.04/ubuntu-20.04-live-server-amd64.iso",
27
+ "iso_checksum": "caf3fd69c77c439f162e2ba6040e9c320c4ff0d69aad1340a514319a9264df9f",
28
+ "iso_checksum_type": "sha256",
29
+
30
+ "ssh_username": "vagrant",
31
+ "ssh_password": "vagrant",
32
+ "ssh_handshake_attempts": "50",
33
+ "ssh_timeout": "10m",
34
+
35
+ "http_directory": "templates/ubuntu",
36
+
37
+ "boot_wait": "5s",
38
+ "boot_command": [
39
+ "<enter><enter><f6><esc><wait> ",
40
+ "autoinstall ds=nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/",
41
+ "<enter>"
42
+ ],
43
+
44
+ "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'"
45
+ }
46
+ ],
47
+
48
+ "post-processors": [
49
+ {
50
+ "type": "vagrant"
51
+ }
52
+ ]
53
+ }
File without changes
@@ -0,0 +1,17 @@
1
+ #cloud-config
2
+ autoinstall:
3
+ version: 1
4
+ identity:
5
+ hostname: unassigned-hostname
6
+ username: vagrant
7
+ password: '$6$IrzMz/ehZN.wfW49$JU36Dv3xOxkAHQTECBjDaSGNyLndBT5JTkL3CC.hLEEw3TBAOJCWanP0meOPqaMwabmIAAICuG288JBK8HdMP.'
8
+ network:
9
+ network:
10
+ version: 2
11
+ ethernets:
12
+ ens33: {dhcp4: true, dhcp-identifier: mac}
13
+ ssh:
14
+ install-server: true
15
+ late-commands:
16
+ - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf
17
+ - 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: boxes
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.1
4
+ version: 3.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nick Charlton
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-13 00:00:00.000000000 Z
11
+ date: 2020-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: claide
@@ -200,8 +200,11 @@ files:
200
200
  - templates/debian/preseed.cfg
201
201
  - templates/debian/stretch64.erb
202
202
  - templates/ubuntu/bionic64.erb
203
+ - templates/ubuntu/focal64.erb
204
+ - templates/ubuntu/meta-data
203
205
  - templates/ubuntu/preseed.cfg
204
206
  - templates/ubuntu/trusty64.erb
207
+ - templates/ubuntu/user-data
205
208
  - templates/ubuntu/xenial64.erb
206
209
  homepage: https://github.com/nickcharlton/boxes
207
210
  licenses: