From d472bf08d54b704e6b01881fe88964f8cbcdc604 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 27 Nov 2023 21:00:35 -0600 Subject: [PATCH] x86_64 to amd64 to match Vagrant arch names --- .github/workflows/build.yml | 6 ++-- README.md | 4 +-- build.xsh | 2 +- build_all.xsh | 2 +- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 4 +-- distros/archlinux/supports.yml | 10 +++---- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 ...64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} | 0 .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 ...64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} | 0 distros/centos-stream/supports.yml | 6 ++-- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 distros/centos/supports.yml | 10 +++---- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 4 +-- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 4 +-- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 distros/debian/supports.yml | 6 ++-- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 distros/fedora/39/x86_64.ks | 19 ++++++++++-- ...64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} | 0 distros/fedora/rawhide/x86_64.ks | 30 ++++++++++++++++--- distros/fedora/rawhide/x86_64.pkrvars.hcl | 13 -------- distros/fedora/supports.yml | 8 ++--- ...64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} | 0 distros/nixos/supports.yml | 6 ++-- .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 .../{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} | 0 distros/ubuntu/supports.yml | 6 ++-- sources/build.pkr.hcl | 18 ++++++----- sources/hyperv-iso.pkr.hcl | 2 +- sources/inputs.pkr.hcl | 2 +- sources/qemu.pkr.hcl | 2 +- sources/virtualbox-iso.pkr.hcl | 2 +- sources/vmware-iso.pkr.hcl | 2 +- test.xsh | 6 ++-- vagrant/{x86_64.rb => amd64.rb} | 0 41 files changed, 99 insertions(+), 75 deletions(-) rename distros/archlinux/rolling/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (70%) rename distros/centos-stream/8/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/centos-stream/8/{x86_64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} (100%) rename distros/centos-stream/9/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/centos-stream/9/{x86_64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} (100%) rename distros/centos/7/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/debian/10/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/debian/11/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (61%) rename distros/debian/12/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (61%) rename distros/debian/9/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/fedora/37/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/fedora/38/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/fedora/39/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/fedora/rawhide/{x86_64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} (100%) delete mode 100644 distros/fedora/rawhide/x86_64.pkrvars.hcl rename distros/nixos/23.05/{x86_64.pkrvars.hcl.sh => amd64.pkrvars.hcl.sh} (100%) rename distros/ubuntu/18.04/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/ubuntu/20.04/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/ubuntu/22.04/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename distros/ubuntu/23.10/{x86_64.pkrvars.hcl => amd64.pkrvars.hcl} (100%) rename vagrant/{x86_64.rb => amd64.rb} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41cb3ce..1c01c17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,15 +31,15 @@ jobs: build: name: Build box - runs-on: ${{ matrix.builder == 'virtualbox-iso.x86_64' && 'macOS-12' || 'ubuntu-22.04' }} + runs-on: ${{ matrix.builder == 'virtualbox-iso.amd64' && 'macOS-12' || 'ubuntu-22.04' }} needs: - collect strategy: fail-fast: false matrix: builder: - - virtualbox-iso.x86_64 - - qemu.x86_64 + - virtualbox-iso.amd64 + - qemu.amd64 distro: ${{ fromJson( needs.collect.outputs.distros ) }} needs_timeout: - distros/ubuntu-20.04-x86_64.pkrvars.hcl diff --git a/README.md b/README.md index fc80630..e877863 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ 1. Try a build 1. You can execute directly with the `packer` executable, if you want 1. If you want to wrap up standard options, or build multiple versions/distros at once, use the `build.xsh` file - 1. `xonsh build.xsh -d -b hyperv-iso.x86_64 -v` + 1. `xonsh build.xsh -d -b hyperv-iso.amd64 -v` 1. You can substitute out any of the options with `-a` to build "all" targets that match ### Troubleshooting @@ -44,4 +44,4 @@ to reach it. 1. Set connection type to 'External' 1. In your DHCP server, assign a static IP address to MAC address "00:00:de:ad:be:ef" 1. Personally, I use dnsmasq and my subnet is 10.42.2.1/16 for DHCP, so the appropriate config line is `dhcp-host=00:00:de:ad:be:ef,10.42.2.254` - 1. The actual IP address you assign is unimportant, and if you need to spoof a different Mac address, edit the file `sources/hyperv-iso.pkr.hcl` \ No newline at end of file + 1. The actual IP address you assign is unimportant, and if you need to spoof a different Mac address, edit the file `sources/hyperv-iso.pkr.hcl` diff --git a/build.xsh b/build.xsh index 3b88dad..54cc6a8 100755 --- a/build.xsh +++ b/build.xsh @@ -16,7 +16,7 @@ support = Support() parser = ArgumentParser("Build a box") parser.add_argument("--distro", "-d", help="Name of the distro/ folder") parser.add_argument("--version", "-v", help="Version of the distro to build") -parser.add_argument("--build", "-b", help="Name of the target build, e.g. qemu.x86_64, virtualbox-iso.x86_64") +parser.add_argument("--build", "-b", help="Name of the target build, e.g. qemu.amd64, virtualbox-iso.amd64") parser.add_argument("--list", "-l", help="List all build targets", action="store_true") parser.add_argument("--all", "-a", help="Build all applicable targets", action="store_true") parser.add_argument("--upload", "-u", help="Force doing uploads", action="store_true") diff --git a/build_all.xsh b/build_all.xsh index 8d4fd44..3b360d8 100755 --- a/build_all.xsh +++ b/build_all.xsh @@ -4,7 +4,7 @@ source ./test.xsh parser = argparse.ArgumentParser("Build all") -parser.add_argument("--provider", choices=get_providers(), default="qemu.x86_64") +parser.add_argument("--provider", choices=get_providers(), default="qemu.amd64") args = parser.parse_args() diff --git a/distros/archlinux/rolling/x86_64.pkrvars.hcl b/distros/archlinux/rolling/amd64.pkrvars.hcl similarity index 70% rename from distros/archlinux/rolling/x86_64.pkrvars.hcl rename to distros/archlinux/rolling/amd64.pkrvars.hcl index c2e3360..b407265 100644 --- a/distros/archlinux/rolling/x86_64.pkrvars.hcl +++ b/distros/archlinux/rolling/amd64.pkrvars.hcl @@ -1,8 +1,8 @@ distro = "archlinux" version = "rolling" iso = { - url = "http://dfw.mirror.rackspace.com/archlinux/iso/2023.08.01/archlinux-x86_64.iso" - checksum = "3bf1287333de5c26663b70a17ce7573f15dc60780b140cbbd1c720338c0abac5" + url = "http://dfw.mirror.rackspace.com/archlinux/iso/2023.11.01/archlinux-2023.11.01-x86_64.iso" + checksum = "477f50617d648e46d6e326549aa56ab92115a29a97f2ca364e944cea06970608" } boot_command = [ " net.ifnames=0 biosdevnames=0", diff --git a/distros/archlinux/supports.yml b/distros/archlinux/supports.yml index 294aa67..68b73d5 100644 --- a/distros/archlinux/supports.yml +++ b/distros/archlinux/supports.yml @@ -1,9 +1,9 @@ rolling: - - arch: x86_64 + - arch: amd64 provider: qemu - - arch: x86_64 + - arch: amd64 provider: virtualbox-iso - - arch: x86_64 + - arch: amd64 provider: vmware-iso - - arch: x86_64 - provider: hyperv-iso \ No newline at end of file + - arch: amd64 + provider: hyperv-iso diff --git a/distros/centos-stream/8/x86_64.pkrvars.hcl b/distros/centos-stream/8/amd64.pkrvars.hcl similarity index 100% rename from distros/centos-stream/8/x86_64.pkrvars.hcl rename to distros/centos-stream/8/amd64.pkrvars.hcl diff --git a/distros/centos-stream/8/x86_64.pkrvars.hcl.sh b/distros/centos-stream/8/amd64.pkrvars.hcl.sh similarity index 100% rename from distros/centos-stream/8/x86_64.pkrvars.hcl.sh rename to distros/centos-stream/8/amd64.pkrvars.hcl.sh diff --git a/distros/centos-stream/9/x86_64.pkrvars.hcl b/distros/centos-stream/9/amd64.pkrvars.hcl similarity index 100% rename from distros/centos-stream/9/x86_64.pkrvars.hcl rename to distros/centos-stream/9/amd64.pkrvars.hcl diff --git a/distros/centos-stream/9/x86_64.pkrvars.hcl.sh b/distros/centos-stream/9/amd64.pkrvars.hcl.sh similarity index 100% rename from distros/centos-stream/9/x86_64.pkrvars.hcl.sh rename to distros/centos-stream/9/amd64.pkrvars.hcl.sh diff --git a/distros/centos-stream/supports.yml b/distros/centos-stream/supports.yml index 8058886..490da6a 100644 --- a/distros/centos-stream/supports.yml +++ b/distros/centos-stream/supports.yml @@ -1,8 +1,8 @@ 8: &supp - - arch: x86_64 + - arch: amd64 provider: qemu - - arch: x86_64 + - arch: amd64 provider: virtualbox-iso - - arch: x86_64 + - arch: amd64 provider: vmware-iso 9: *supp diff --git a/distros/centos/7/x86_64.pkrvars.hcl b/distros/centos/7/amd64.pkrvars.hcl similarity index 100% rename from distros/centos/7/x86_64.pkrvars.hcl rename to distros/centos/7/amd64.pkrvars.hcl diff --git a/distros/centos/supports.yml b/distros/centos/supports.yml index 1df1bc7..86d239b 100644 --- a/distros/centos/supports.yml +++ b/distros/centos/supports.yml @@ -1,9 +1,9 @@ 7: - - arch: x86_64 + - arch: amd64 provider: qemu - - arch: x86_64 + - arch: amd64 provider: virtualbox-iso - - arch: x86_64 + - arch: amd64 provider: vmware-iso - - arch: x86_64 - provider: hyperv-iso \ No newline at end of file + - arch: amd64 + provider: hyperv-iso diff --git a/distros/debian/10/x86_64.pkrvars.hcl b/distros/debian/10/amd64.pkrvars.hcl similarity index 100% rename from distros/debian/10/x86_64.pkrvars.hcl rename to distros/debian/10/amd64.pkrvars.hcl diff --git a/distros/debian/11/x86_64.pkrvars.hcl b/distros/debian/11/amd64.pkrvars.hcl similarity index 61% rename from distros/debian/11/x86_64.pkrvars.hcl rename to distros/debian/11/amd64.pkrvars.hcl index d722830..fb6f665 100644 --- a/distros/debian/11/x86_64.pkrvars.hcl +++ b/distros/debian/11/amd64.pkrvars.hcl @@ -1,8 +1,8 @@ distro = "debian" version = "11" iso = { - url = "https://cdimage.debian.org/cdimage/archive/11.7.0/amd64/iso-cd/debian-11.7.0-amd64-netinst.iso" - checksum = "eb3f96fd607e4b67e80f4fc15670feb7d9db5be50f4ca8d0bf07008cb025766b" + url = "http://cdimage.debian.org/cdimage/archive/11.8.0/amd64/iso-cd/debian-11.8.0-amd64-netinst.iso" + checksum = "d7a74813a734083df30c8d35784926deaa36bc41e5c0766388e9f591ab056b72" } boot_command = [ "", diff --git a/distros/debian/12/x86_64.pkrvars.hcl b/distros/debian/12/amd64.pkrvars.hcl similarity index 61% rename from distros/debian/12/x86_64.pkrvars.hcl rename to distros/debian/12/amd64.pkrvars.hcl index accb654..9a01911 100644 --- a/distros/debian/12/x86_64.pkrvars.hcl +++ b/distros/debian/12/amd64.pkrvars.hcl @@ -1,8 +1,8 @@ distro = "debian" version = "12" iso = { - url = "https://cdimage.debian.org/cdimage/archive/12.0.0/amd64/iso-cd/debian-12.0.0-amd64-netinst.iso" - checksum = "3b0e9718e3653435f20d8c2124de6d363a51a1fd7f911b9ca0c6db6b3d30d53e" + url = "http://cdimage.debian.org/cdimage/release/12.2.0/amd64/iso-cd/debian-12.2.0-amd64-netinst.iso" + checksum = "23ab444503069d9ef681e3028016250289a33cc7bab079259b73100daee0af66" } boot_command = [ "", diff --git a/distros/debian/9/x86_64.pkrvars.hcl b/distros/debian/9/amd64.pkrvars.hcl similarity index 100% rename from distros/debian/9/x86_64.pkrvars.hcl rename to distros/debian/9/amd64.pkrvars.hcl diff --git a/distros/debian/supports.yml b/distros/debian/supports.yml index 2c82f74..ba157fd 100644 --- a/distros/debian/supports.yml +++ b/distros/debian/supports.yml @@ -1,9 +1,9 @@ 10: &supp - - arch: x86_64 + - arch: amd64 provider: qemu - - arch: x86_64 + - arch: amd64 provider: virtualbox-iso - - arch: x86_64 + - arch: amd64 provider: vmware-iso 11: *supp 12: *supp diff --git a/distros/fedora/37/x86_64.pkrvars.hcl b/distros/fedora/37/amd64.pkrvars.hcl similarity index 100% rename from distros/fedora/37/x86_64.pkrvars.hcl rename to distros/fedora/37/amd64.pkrvars.hcl diff --git a/distros/fedora/38/x86_64.pkrvars.hcl b/distros/fedora/38/amd64.pkrvars.hcl similarity index 100% rename from distros/fedora/38/x86_64.pkrvars.hcl rename to distros/fedora/38/amd64.pkrvars.hcl diff --git a/distros/fedora/39/x86_64.pkrvars.hcl b/distros/fedora/39/amd64.pkrvars.hcl similarity index 100% rename from distros/fedora/39/x86_64.pkrvars.hcl rename to distros/fedora/39/amd64.pkrvars.hcl diff --git a/distros/fedora/39/x86_64.ks b/distros/fedora/39/x86_64.ks index e08e699..c29c9d4 100644 --- a/distros/fedora/39/x86_64.ks +++ b/distros/fedora/39/x86_64.ks @@ -34,11 +34,18 @@ url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$relea reboot ##### begin package list ############################################# -%packages --inst-langs=en +%packages --instLangs=en # Include packages for the cloud-server-environment group @^cloud-server-environment +# Install the tracer dnf plugin to enable automatic reboots +# IF the user requests package updates +# AND requests a reboot +# AND the packages updated require a reboot. +# https://fedoraproject.org/wiki/Changes/Automatic_Cloud_Reboot_On_Updates +python3-dnf-plugin-tracer + # Don't include the kernel toplevel package since it pulls in # kernel-modules. We're happy for now with kernel-core. -kernel @@ -136,6 +143,7 @@ btrfs filesystem sync / # Let's clean it up. echo "Cleanup leftover networking configuration" rm -f /etc/NetworkManager/system-connections/*.nmconnection +#*/ # Truncate the /etc/resolv.conf left over from NetworkManager during the # kickstart. This causes delays in boot with cloud-init because the @@ -149,16 +157,21 @@ truncate -s 0 /etc/machine-id sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config -#' cat > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf < /etc/sudoers.d/vagrant-nopasswd sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config cat > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf <e", - "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/x86_64.ks console=tty0 console=ttyS0" -] -cd_files = [ - "distros/fedora/rawhide/*.ks" -] diff --git a/distros/fedora/supports.yml b/distros/fedora/supports.yml index 61a3627..edf71ad 100644 --- a/distros/fedora/supports.yml +++ b/distros/fedora/supports.yml @@ -1,12 +1,12 @@ 37: &supp - - arch: x86_64 + - arch: amd64 provider: qemu - - arch: x86_64 + - arch: amd64 provider: virtualbox-iso - - arch: x86_64 + - arch: amd64 provider: vmware-iso 38: *supp 39: *supp rawhide: - - arch: x86_64 + - arch: amd64 provider: qemu diff --git a/distros/nixos/23.05/x86_64.pkrvars.hcl.sh b/distros/nixos/23.05/amd64.pkrvars.hcl.sh similarity index 100% rename from distros/nixos/23.05/x86_64.pkrvars.hcl.sh rename to distros/nixos/23.05/amd64.pkrvars.hcl.sh diff --git a/distros/nixos/supports.yml b/distros/nixos/supports.yml index 38bca44..d359808 100644 --- a/distros/nixos/supports.yml +++ b/distros/nixos/supports.yml @@ -1,7 +1,7 @@ 23.05: - - arch: x86_64 + - arch: amd64 provider: qemu - - arch: x86_64 + - arch: amd64 provider: virtualbox-iso - - arch: x86_64 + - arch: amd64 provider: vmware-iso diff --git a/distros/ubuntu/18.04/x86_64.pkrvars.hcl b/distros/ubuntu/18.04/amd64.pkrvars.hcl similarity index 100% rename from distros/ubuntu/18.04/x86_64.pkrvars.hcl rename to distros/ubuntu/18.04/amd64.pkrvars.hcl diff --git a/distros/ubuntu/20.04/x86_64.pkrvars.hcl b/distros/ubuntu/20.04/amd64.pkrvars.hcl similarity index 100% rename from distros/ubuntu/20.04/x86_64.pkrvars.hcl rename to distros/ubuntu/20.04/amd64.pkrvars.hcl diff --git a/distros/ubuntu/22.04/x86_64.pkrvars.hcl b/distros/ubuntu/22.04/amd64.pkrvars.hcl similarity index 100% rename from distros/ubuntu/22.04/x86_64.pkrvars.hcl rename to distros/ubuntu/22.04/amd64.pkrvars.hcl diff --git a/distros/ubuntu/23.10/x86_64.pkrvars.hcl b/distros/ubuntu/23.10/amd64.pkrvars.hcl similarity index 100% rename from distros/ubuntu/23.10/x86_64.pkrvars.hcl rename to distros/ubuntu/23.10/amd64.pkrvars.hcl diff --git a/distros/ubuntu/supports.yml b/distros/ubuntu/supports.yml index f6f192e..94c3d5b 100644 --- a/distros/ubuntu/supports.yml +++ b/distros/ubuntu/supports.yml @@ -1,9 +1,9 @@ 20.04: &supp - - arch: x86_64 + - arch: amd64 provider: qemu - - arch: x86_64 + - arch: amd64 provider: virtualbox-iso - - arch: x86_64 + - arch: amd64 provider: vmware-iso 22.04: *supp "23.10": *supp diff --git a/sources/build.pkr.hcl b/sources/build.pkr.hcl index 3a2f46f..183aed6 100644 --- a/sources/build.pkr.hcl +++ b/sources/build.pkr.hcl @@ -10,7 +10,7 @@ packer { } vagrant = { source = "github.com/hashicorp/vagrant" - version = "~> 1" + version = "1.1.1" } vmware = { version = ">= 1.0" @@ -25,26 +25,26 @@ packer { build { sources = [ - "source.qemu.x86_64", - "source.virtualbox-iso.x86_64", - "source.vmware-iso.x86_64", - "source.hyperv-iso.x86_64" + "source.qemu.amd64", + "source.virtualbox-iso.amd64", + "source.vmware-iso.amd64", + "source.hyperv-iso.amd64" ] # If anything needs specific support for one of the distros provisioner "shell" { execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'" - only = ["qemu.x86_64"] + only = ["qemu.amd64"] script = "distros/${var.distro}/${var.version}/qemu.sh" } provisioner "shell" { execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'" - only = ["virtualbox-iso.x86_64"] + only = ["virtualbox-iso.amd64"] script = "distros/${var.distro}/${var.version}/virtualbox.sh" } provisioner "shell" { execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'" - only = ["vmware-iso.x86_64"] + only = ["vmware-iso.amd64"] script = "distros/${var.distro}/${var.version}/vmware.sh" } @@ -69,7 +69,9 @@ build { post-processor "vagrant-cloud" { name = "upload" access_token = var.vagrant_cloud_token + architecture = var.architecture box_tag = "boxen/${local.name}" + default_architecture = "amd64" version = var.build version_description = local.description } diff --git a/sources/hyperv-iso.pkr.hcl b/sources/hyperv-iso.pkr.hcl index 651310a..8d606be 100644 --- a/sources/hyperv-iso.pkr.hcl +++ b/sources/hyperv-iso.pkr.hcl @@ -1,4 +1,4 @@ -source "hyperv-iso" "x86_64" { +source "hyperv-iso" "amd64" { iso_url = var.iso.url iso_checksum = var.iso.checksum output_directory = "output/hyperv/${local.name}" diff --git a/sources/inputs.pkr.hcl b/sources/inputs.pkr.hcl index cf47c53..5b5ecc3 100644 --- a/sources/inputs.pkr.hcl +++ b/sources/inputs.pkr.hcl @@ -10,7 +10,7 @@ variable "distro" { variable "arch" { type = string - default = "x86_64" + default = "amd64" } variable "version" { diff --git a/sources/qemu.pkr.hcl b/sources/qemu.pkr.hcl index 532efb3..4170ac1 100644 --- a/sources/qemu.pkr.hcl +++ b/sources/qemu.pkr.hcl @@ -3,7 +3,7 @@ variable "qemu_accelerator" { default = "kvm" } -source "qemu" "x86_64" { +source "qemu" "amd64" { iso_url = var.iso.url iso_checksum = var.iso.checksum output_directory = "output/libvirt/${local.name}" diff --git a/sources/virtualbox-iso.pkr.hcl b/sources/virtualbox-iso.pkr.hcl index 81f49c5..22c5e72 100644 --- a/sources/virtualbox-iso.pkr.hcl +++ b/sources/virtualbox-iso.pkr.hcl @@ -1,4 +1,4 @@ -source "virtualbox-iso" "x86_64" { +source "virtualbox-iso" "amd64" { iso_url = var.iso.url iso_checksum = var.iso.checksum output_directory = "output/virtualbox/${local.name}" diff --git a/sources/vmware-iso.pkr.hcl b/sources/vmware-iso.pkr.hcl index d632452..d6ac47c 100644 --- a/sources/vmware-iso.pkr.hcl +++ b/sources/vmware-iso.pkr.hcl @@ -1,4 +1,4 @@ -source "vmware-iso" "x86_64" { +source "vmware-iso" "amd64" { iso_url = var.iso.url iso_checksum = var.iso.checksum output_directory = "output/vmware/${local.name}" diff --git a/test.xsh b/test.xsh index e8524af..2e085bf 100755 --- a/test.xsh +++ b/test.xsh @@ -24,9 +24,9 @@ def get_vagrant_provider(provider): def get_providers(): "List of providers as defined in sources/" providers: set[str] = { - "qemu.x86_64" - "virtualbox-iso.x86_64", - "vmware-iso.x86_64" + "qemu.amd64" + "virtualbox-iso.amd64", + "vmware-iso.amd64" } return providers diff --git a/vagrant/x86_64.rb b/vagrant/amd64.rb similarity index 100% rename from vagrant/x86_64.rb rename to vagrant/amd64.rb