x86_64 to amd64 to match Vagrant arch names

distros/fedora/rawhide/x86_64.ks

@@ -75,6 +75,9 @@ qemu-guest-agent
 # in /usr/share/GeoIP
 -geolite2-country
 -geolite2-city
+
+# Specific to vagrant
+dnf-yum
 rsync
 fuse-sshfs
 %end
@@ -83,16 +86,26 @@ fuse-sshfs
 
 ##### begin kickstart post ###########################################
 %post --erroronfail
+#!/bin/bash
 set -x
+if [ -e /dev/vda ]; then
+	device="/dev/vda"
+elif [ -e /dev/sda ]; then
+	device="/dev/sda"
+else
+	echo "No device found"
+	exit 1
+fi
+
 
 if [ "$(arch)" = "x86_64" ]; then
 # Set up legacy BIOS boot if we booted from UEFI
-grub2-install --target=i386-pc /dev/vda
+grub2-install --target=i386-pc "${device}"
 fi
 
 # Blivet sets pmbr_boot flag erroneously and we need to purge it
 # otherwise it'll fail to boot
-parted /dev/vda disk_set pmbr_boot off
+parted "${device}" disk_set pmbr_boot off
 
 # linux-firmware is installed by default and is quite large. As of mid 2020:
 #   Total download size: 97 M
@@ -145,13 +158,22 @@ 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 <<EOF
-# For now the vagrant insecure key is an rsa key
-# https://github.com/hashicorp/vagrant/issues/11783
+# Starting in Vagrant 2.3.8 there is support for an EDDSA25519 key,
+# but prior to that, only the insecure RSA is available. When the time
+# comes, we can remove this bit, but we keep it for a long time
+# for backwards compatibility
 PubkeyAcceptedKeyTypes=+ssh-rsa
 EOF
 
 ssh-keygen -A
 
+
+mkdir -m 0700 -p /home/vagrant/.ssh/
+curl -L -o /home/vagrant/.ssh/authorized_keys "https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub"
+chown -R vagrant:vagrant /home/vagrant/.ssh
+chmod 600 /home/vagrant/.ssh/authorized_keys
+chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
+
 %end
 ##### end kickstart post ############################################
 

distros/fedora/rawhide/x86_64.pkrvars.hcl

@@ -1,13 +0,0 @@
-distro = "fedora"
-version = "rawhide"
-iso = {
-	url = "https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Server/x86_64/iso/Fedora-Server-dvd-x86_64-Rawhide-20231126.n.0.iso"
-	checksum = "5613927b713cac9503a6475de95c518c9615a0aeb784b6444764a1ee0b1b69af"
-}
-boot_command = [
-  "<up>e<down><down><end><bs><bs><bs><bs><bs>",
-  "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/x86_64.ks console=tty0 console=ttyS0<f10>"
-]
-cd_files = [
-	"distros/fedora/rawhide/*.ks"
-]