Skip to content

Commit

Permalink
Merge branch 'main' of github.com:chef/bento
Browse files Browse the repository at this point in the history
* 'main' of github.com:chef/bento:
  bumped iso url versions (chef#1553)
  Fix waiting for ssh - ubuntu netplan dhcp-identifer format error (chef#1550)
  • Loading branch information
hunleyd committed Feb 29, 2024
2 parents 822d18d + 9a3547a commit ab9f116
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
os_name = "ubuntu"
os_version = "22.04"
os_arch = "aarch64"
iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.3-live-server-arm64.iso"
iso_url = "https://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.4-live-server-arm64.iso"
iso_checksum = "file:https://cdimage.ubuntu.com/releases/jammy/release/SHA256SUMS"
parallels_guest_os_type = "ubuntu"
vbox_guest_os_type = "Ubuntu_64"
Expand Down
2 changes: 1 addition & 1 deletion os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
os_name = "ubuntu"
os_version = "22.04"
os_arch = "x86_64"
iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.3-live-server-amd64.iso"
iso_url = "https://releases.ubuntu.com/jammy/ubuntu-22.04.4-live-server-amd64.iso"
iso_checksum = "file:https://releases.ubuntu.com/jammy/SHA256SUMS"
parallels_guest_os_type = "ubuntu"
vbox_guest_os_type = "Ubuntu_64"
Expand Down
2 changes: 1 addition & 1 deletion packer_templates/http/ubuntu/user-data
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ autoinstall:
allow-pw: yes
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'
- 'sed -i "s/dhcp4: true/&\n dhcp-identifier: mac/" /target/etc/netplan/00-installer-config.yaml'
- echo 'vagrant ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/vagrant
# Enable hyper-v daemons only if using hyper-v virtualization
- if [ $(virt-what) == "hyperv" ]; then apt-get update && apt-get install -y hyperv-daemons linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils && systemctl enable hypervvssd && systemctl enable hypervkvpd && systemctl start hypervvssd && systemctl start hypervkvpd; fi

0 comments on commit ab9f116

Please sign in to comment.