diff --git a/distros/almalinux/9/amd64.pkrvars.hcl b/distros/almalinux/9/amd64.pkrvars.hcl index 0aaffa1..83de82e 100644 --- a/distros/almalinux/9/amd64.pkrvars.hcl +++ b/distros/almalinux/9/amd64.pkrvars.hcl @@ -1,8 +1,8 @@ distro = "almalinux" version = "9" iso = { - url = "https://mirrors.kernel.org/almalinux/9.3/isos/x86_64/AlmaLinux-9.3-x86_64-boot.iso" - checksum = "af5377a1d16bbe599ea91a8761ad645f2f54687075802bdc0c0703ee610182e9" + url = "https://mirrors.kernel.org/almalinux/9.4/isos/x86_64/AlmaLinux-9.4-x86_64-boot.iso" + checksum = "1e5d7da3d84d5d9a5a1177858a5df21b868390bfccf7f0f419b1e59acc293160" } boot_command = [ "e", diff --git a/distros/almalinux/supports.yml b/distros/almalinux/supports.yml index 533b6df..175fab4 100644 --- a/distros/almalinux/supports.yml +++ b/distros/almalinux/supports.yml @@ -1,4 +1,4 @@ -8: &supp +9: &supp - arch: amd64 provider: qemu - arch: amd64 @@ -7,4 +7,3 @@ provider: vmware-iso - arch: amd64 provider: hyperv-iso -9: *supp diff --git a/distros/fedora/40/amd64-ks.cfg b/distros/fedora/40/amd64-ks.cfg new file mode 100644 index 0000000..90ed9f8 --- /dev/null +++ b/distros/fedora/40/amd64-ks.cfg @@ -0,0 +1,184 @@ +user --name=vagrant --password=vagrant +rootpw vagrant + +text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931 +lang en_US.UTF-8 +keyboard us +timezone --utc Etc/UTC + +selinux --enforcing +rootpw --lock --iscrypted locked + +firewall --disabled + +# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images. +bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8 biosdevnames=0" + +services --enabled=sshd + +# Configure for gpt with bios+uefi +clearpart --all --initlabel --disklabel=gpt +part prepboot --size=4 --fstype=prepboot +part biosboot --size=1 --fstype=biosboot +part /boot/efi --size=100 --fstype=efi +part /boot --size=1000 --fstype=ext4 --label=boot +part btrfs.007 --size=2000 --fstype=btrfs --grow +btrfs none --label=fedora btrfs.007 +btrfs /home --subvol --name=home LABEL=fedora +btrfs / --subvol --name=root LABEL=fedora + +repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch +repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch +url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch + +reboot + +##### begin package list ############################################# +%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 +kernel-core + +# Don't include dracut-config-rescue. It will have dracut generate a +# "rescue" entry in the grub menu, but that also means there is a +# rescue kernel and initramfs that get created, which (currently) add +# about another 40MiB to the /boot/ partition. Also the "rescue" mode +# is generally not useful in the cloud. +-dracut-config-rescue + +# Plymouth provides a graphical boot animation. In the cloud we don't +# need a graphical boot animation. This also means anaconda won't put +# rhgb/quiet on kernel command line +-plymouth + +# Install qemu-guest-agent https://pagure.io/cloud-sig/issue/319 To +# improve the integration with OpenStack and other VM management +# systems (oVirt, KubeVirt). +qemu-guest-agent + + +# No need for firewalld for now. We don't have a firewall on by default. +-firewalld + +# Don't include the geolite2 databases, which end up with 66MiB +# in /usr/share/GeoIP +-geolite2-country +-geolite2-city + +# Specific to vagrant +dnf-yum +rsync +fuse-sshfs +%end +##### end package list ############################################### + + +##### 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 + +virt="$(systemd-detect-virt)" +if [ "${virt}" == "microsoft" ]; then + dnf install -y hyperv-daemons + systemctl enable hpervfcopyd + systemctl enable hypervkvpd + systemctl enable hypervvssd +fi + +if [ "$(arch)" = "x86_64" ]; then +# Set up legacy BIOS boot if we booted from UEFI +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 "${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 +# Installed size: 268 M +# So far we've been fine shipping without it so let's continue. +# More discussion about this in #1234504. +echo "Removing linux-firmware package." +rpm -e linux-firmware + +# See the systemd-random-seed.service man page that says: +# " It is recommended to remove the random seed from OS images intended +# for replication on multiple systems" +echo "Removing random-seed so it's not the same in every image." +rm -f /var/lib/systemd/random-seed + +echo "Import RPM GPG key" +releasever=$(rpm --eval '%{fedora}') +basearch=$(uname -i) +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch + +echo "Zeroing out empty space." +# Create zeros file with nodatacow and no compression +touch /var/tmp/zeros +chattr +C /var/tmp/zeros +# This forces the filesystem to reclaim space from deleted files +dd bs=1M if=/dev/zero of=/var/tmp/zeros || : +echo "(Don't worry -- that out-of-space error was expected.)" +# Force sync to disk (Cf. https://pagure.io/cloud-sig/issue/340#comment-743430) +btrfs filesystem sync / +rm -f /var/tmp/zeros +btrfs filesystem sync / + +# When we build the image a networking config file gets left behind. +# 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 +# 192.168.122.1 DNS server cannot be reached. +truncate -s 0 /etc/resolv.conf + +# Clear machine-id on pre generated images +truncate -s 0 /etc/machine-id + +# Vagrant setup +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 <e ", + "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/amd64-ks.cfg console=tty0" +] +cd_files = [ + "distros/fedora/40/*.cfg" +] +vbox_os_type = "Fedora_64" diff --git a/distros/fedora/40/finalize.sh b/distros/fedora/40/finalize.sh new file mode 100644 index 0000000..c30e5a8 --- /dev/null +++ b/distros/fedora/40/finalize.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +dnf -y update + +dnf clean all diff --git a/distros/fedora/40/qemu.sh b/distros/fedora/40/qemu.sh new file mode 100644 index 0000000..569dc7c --- /dev/null +++ b/distros/fedora/40/qemu.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +dnf install -y qemu-guest-agent +systemctl start qemu-guest-agent +systemctl enable qemu-guest-agent diff --git a/distros/fedora/40/virtualbox.sh b/distros/fedora/40/virtualbox.sh new file mode 100644 index 0000000..209dab5 --- /dev/null +++ b/distros/fedora/40/virtualbox.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +dnf install -y virtualbox-guest-additions +systemctl start vboxservice +systemctl enable vboxservice diff --git a/distros/fedora/40/vmware.sh b/distros/fedora/40/vmware.sh new file mode 100644 index 0000000..058afc2 --- /dev/null +++ b/distros/fedora/40/vmware.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +dnf install -y open-vm-tools diff --git a/distros/fedora/supports.yml b/distros/fedora/supports.yml index 295db47..8155968 100644 --- a/distros/fedora/supports.yml +++ b/distros/fedora/supports.yml @@ -1,5 +1,6 @@ 37: # EOL -38: &supp +38: # EOL +39: &supp - arch: amd64 provider: qemu - arch: amd64 @@ -8,7 +9,7 @@ provider: vmware-iso - arch: amd64 provider: hyperv-iso -39: *supp +40: *supp rawhide: - arch: amd64 provider: qemu diff --git a/distros/rockylinux/9/amd64.pkrvars.hcl b/distros/rockylinux/9/amd64.pkrvars.hcl index fd49627..be8f547 100644 --- a/distros/rockylinux/9/amd64.pkrvars.hcl +++ b/distros/rockylinux/9/amd64.pkrvars.hcl @@ -1,8 +1,8 @@ distro = "rockylinux" version = "9" iso = { - url = "http://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.3-x86_64-boot.iso" - checksum = "eb096f0518e310f722d5ebd4c69f0322df4fc152c6189f93c5c797dc25f3d2e1" + url = "https://download.rockylinux.org/pub/rocky/9.4/isos/x86_64/Rocky-9.4-x86_64-boot.iso" + checksum = "c7e95e3dba88a1f68fff8b7d4e66adf6f76ac4fba2e246a83c46ab79574c78a8" } boot_command = [ "e", diff --git a/distros/rockylinux/supports.yml b/distros/rockylinux/supports.yml index 533b6df..175fab4 100644 --- a/distros/rockylinux/supports.yml +++ b/distros/rockylinux/supports.yml @@ -1,4 +1,4 @@ -8: &supp +9: &supp - arch: amd64 provider: qemu - arch: amd64 @@ -7,4 +7,3 @@ provider: vmware-iso - arch: amd64 provider: hyperv-iso -9: *supp