boxes 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99e6d695e414125521acc7148c0e85489301461065b51f270edb32c537ce924d
-  data.tar.gz: f8c91525640ea202ab9817298b982c502591e53b16fd1a4d35dc1bb3c8fb4dff
+  metadata.gz: 2e467377a668469709919be381ac4da37cb50ce2914b22d7d94afae40d4e084c
+  data.tar.gz: b62708cfaa698358e6411933c278bcdf4f392f5d666a9bb68ef72e0870ae4a37
 SHA512:
-  metadata.gz: 03262de00b3ae3df81d7f99e8f75e2793babe11cae7550229a5632db1789c3aab59def3c9cba0b0b7222533b22bbdb20974164346d9ec5233af84da70273c760
-  data.tar.gz: a238f86f78912b49242f88dfe4dc387be15de5c6c28b69e2231fa78940c686327f2efd55b1dc1372aa628bc18d0c86a96b025d4556fd347f06155d8a788f9aef
+  metadata.gz: 3d3a71731d23f25de57b6ff486517dc07d2efcd1925d0393469c9d40c71629eb20490ac697287e2c19529fa7514deec3f1bdba2e902ed9be3d705e9626fa64ae
+  data.tar.gz: 51488c7bda7f432ee37b51ce9f39372f48bd5a12a08dadd94bf7a4d4a14795678fbbe666d4ee0dc472961f6c5e6dc7e01cd0f9753e78151ece5188ef4b51aea8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 3.7.0 (19/08/2020)
+
+* Support for Ubuntu 20.04 ([58])
+
+[58]: https://github.com/nickcharlton/boxes/pull/58
+
 ## 3.6.1 (13/08/2020)
 
 * Update Debian Buster from 10.3.0 to 10.5.0

data/lib/boxes/version.rb

@@ -1,3 +1,3 @@
 module Boxes
-  VERSION = "3.6.1".freeze
+  VERSION = "3.7.0".freeze
 end

data/scripts/vmtools.sh

@@ -4,6 +4,10 @@
 # Configure the relevant VM tools for this builder.
 ##
 
+distribution=$(lsb_release -si)
+version=$(lsb_release -sr)
+major_version=$(echo "$version" | awk -F . '{print $1}')
+
 case $PACKER_BUILDER_TYPE in
     'virtualbox-iso')
         echo "Installing VirtualBox Guest Additions..."
@@ -15,17 +19,23 @@ case $PACKER_BUILDER_TYPE in
         rm -f /home/vagrant/VBoxGuestAdditions.iso
     ;;
     'vmware-iso')
-        echo "Installing VMware Tools..."
-        apt-get -qy install fuse
-        mkdir -p /mnt/cdrom
-        mount -o loop /home/vagrant/linux.iso /mnt/cdrom
+				if [ "$distribution" = 'Ubuntu' ]; then
+					if [ "$major_version" -le "19" ]; then
+						echo "Installing VMware Tools..."
+						apt-get -qy install fuse
+						mkdir -p /mnt/cdrom
+						mount -o loop /home/vagrant/linux.iso /mnt/cdrom
 
-        cd /tmp
-        tar -zxpf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
-        /tmp/vmware-tools-distrib/vmware-install.pl --force-install --default
+						cd /tmp
+						tar -zxpf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
+						/tmp/vmware-tools-distrib/vmware-install.pl --force-install --default
 
-        umount /mnt/cdrom
-        rm -f /home/vagrant/linux.iso
+						umount /mnt/cdrom
+						rm -f /home/vagrant/linux.iso
+					else
+						echo "Skipping installing VMware Tools because open-vm-tools works..."
+					fi
+				fi
     ;;
     *)
         printf "Nothing to do for the %s builder type.\n" $PACKER_BUILDER_TYPE

data/templates/ubuntu/focal64.erb

@@ -0,0 +1,53 @@
+{
+    "provisioners": [
+        {
+            "type": "shell",
+            "scripts": [
+                <%= ["postinstall.sh", "vmtools.sh", @scripts].flatten.map { |i| "\"scripts/#{i}\"" }.join(", ") %>
+            ],
+            "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -E -S bash '{{ .Path }}'"
+        }
+    ],
+
+    "builders": [
+        {
+            "name": "<%= @name %>",
+            "type": "<%= @provider %>-iso",
+            <%- if @provider == "vmware" -%>
+            "guest_os_type": "ubuntu-64",
+            "tools_upload_flavor": "linux",
+            <%- else -%>
+            "guest_os_type": "Ubuntu_64",
+            <%- end -%>
+            "headless": true,
+
+            "memory": 1024,
+
+            "iso_url": "http://releases.ubuntu.com/20.04/ubuntu-20.04-live-server-amd64.iso",
+            "iso_checksum": "caf3fd69c77c439f162e2ba6040e9c320c4ff0d69aad1340a514319a9264df9f",
+            "iso_checksum_type": "sha256",
+
+            "ssh_username": "vagrant",
+            "ssh_password": "vagrant",
+            "ssh_handshake_attempts": "50",
+            "ssh_timeout": "10m",
+
+            "http_directory": "templates/ubuntu",
+
+            "boot_wait": "5s",
+            "boot_command": [
+              "<enter><enter><f6><esc><wait> ",
+              "autoinstall ds=nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/",
+              "<enter>"
+            ],
+
+            "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'"
+        }
+    ],
+
+    "post-processors": [
+        {
+            "type": "vagrant"
+        }
+    ]
+}

data/templates/ubuntu/user-data

@@ -0,0 +1,17 @@
+#cloud-config
+autoinstall:
+  version: 1
+  identity:
+    hostname: unassigned-hostname
+    username: vagrant
+    password: '$6$IrzMz/ehZN.wfW49$JU36Dv3xOxkAHQTECBjDaSGNyLndBT5JTkL3CC.hLEEw3TBAOJCWanP0meOPqaMwabmIAAICuG288JBK8HdMP.'
+  network:
+    network:
+      version: 2
+      ethernets:
+        ens33: {dhcp4: true, dhcp-identifier: mac}
+  ssh:
+    install-server: true
+  late-commands:
+    - sed -i 's/^#*\(send dhcp-client-identifier\).*$/\1 = hardware;/' /target/etc/dhcp/dhclient.conf
+    - 'sed -i "s/dhcp4: true/&\n      dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxes
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Nick Charlton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -200,8 +200,11 @@ files:
 - templates/debian/preseed.cfg
 - templates/debian/stretch64.erb
 - templates/ubuntu/bionic64.erb
+- templates/ubuntu/focal64.erb
+- templates/ubuntu/meta-data
 - templates/ubuntu/preseed.cfg
 - templates/ubuntu/trusty64.erb
+- templates/ubuntu/user-data
 - templates/ubuntu/xenial64.erb
 homepage: https://github.com/nickcharlton/boxes
 licenses: