diff --git a/fedora-cloud-base-vagrant.ks b/fedora-cloud-base-vagrant.ks index 8313d3d..7452a53 100644 --- a/fedora-cloud-base-vagrant.ks +++ b/fedora-cloud-base-vagrant.ks @@ -22,6 +22,12 @@ rootpw vagrant bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" %packages +# The default koji Vagrantfile configuration uses rsync to sync files between +# the vagrant host and the guest. It uses yum to verify that rsync is present +# and/or install it if it is not. It will fail without adding the yum compat +# layer for dnf +# TODO: Teach vagrant about dnf +dnf-yum # rsync gets installed when the Vagrant box is first launched on the # users setup. This can actually take a bit of time. Just fold it # in to the base box disk image diff --git a/fedora-container-base-minimal.ks b/fedora-container-base-minimal.ks index ae0b19e..9a92ce9 100644 --- a/fedora-container-base-minimal.ks +++ b/fedora-container-base-minimal.ks @@ -1,12 +1,11 @@ # See fedora-container-common.ks for details on how to hack on container image kickstarts -# This base is a stripped back Fedora image without python3. +# This base is a stripped back Fedora image without python3/dnf. # If you need that use the standard base image. %include fedora-container-common.ks %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps -# DNF 5 replaces microdnf in Fedora 39+. -dnf5 +microdnf %end diff --git a/fedora-container-base.ks b/fedora-container-base.ks index 7995ace..dc965ec 100644 --- a/fedora-container-base.ks +++ b/fedora-container-base.ks @@ -1,5 +1,5 @@ # See fedora-container-common.ks for details on how to hack on container image kickstarts -# This base is a standard Fedora image with python3 and dnf5 +# This base is a standard Fedora image with python3 and dnf %include fedora-container-common.ks @@ -7,8 +7,8 @@ rootfiles tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 vim-minimal -dnf5 -dnf5-plugins +dnf +dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 sudo -glibc-langpack-en -langpacks-en diff --git a/fedora-container-toolbox.ks b/fedora-container-toolbox.ks index 357842e..df1d076 100644 --- a/fedora-container-toolbox.ks +++ b/fedora-container-toolbox.ks @@ -1,7 +1,7 @@ # Kickstart file for Fedora Toolbox # See fedora-container-common.ks for details on how to hack on container image kickstarts -# This base is a standard Fedora image with python3 and dnf5 +# This base is a standard Fedora image with python3 and dnf %include fedora-container-common.ks @@ -15,8 +15,9 @@ bzip2 coreutils-common curl diffutils -dnf5 -dnf5-plugins +dnf +dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 +dnf-plugins-core findutils flatpak-spawn fpaste diff --git a/fedora-eln-container-base.ks b/fedora-eln-container-base.ks index 3aa0ed4..f14e7f6 100644 --- a/fedora-eln-container-base.ks +++ b/fedora-eln-container-base.ks @@ -1,5 +1,5 @@ # See fedora-container-common.ks for details on how to hack on container image kickstarts -# This base is a standard Fedora-ELN image with python3 and dnf5 +# This base is a standard Fedora-ELN image with python3 and dnf %include fedora-container-common.ks @@ -10,7 +10,8 @@ fedora-repos-eln rootfiles tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 vim-minimal -dnf5 +dnf +dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 sudo -glibc-langpack-en -langpacks-en diff --git a/fedora-eln-guest.ks b/fedora-eln-guest.ks index 4b854cc..ce2b301 100644 --- a/fedora-eln-guest.ks +++ b/fedora-eln-guest.ks @@ -32,11 +32,11 @@ reboot # Packages %packages @core -dnf5 +dnf kernel yum nfs-utils -dnf5-plugins +dnf-utils # pull firmware packages out -aic94xx-firmware diff --git a/fedora-minimal-common.ks b/fedora-minimal-common.ks index 421da80..b82c732 100644 --- a/fedora-minimal-common.ks +++ b/fedora-minimal-common.ks @@ -1,5 +1,5 @@ %packages -dnf5 +microdnf -@standard -initial-setup-gui -generic-release* diff --git a/fedora-modular-disk-minimal.ks b/fedora-modular-disk-minimal.ks index 014ef60..a6120e4 100644 --- a/fedora-modular-disk-minimal.ks +++ b/fedora-modular-disk-minimal.ks @@ -31,7 +31,7 @@ coreutils-single util-linux rpm shadow-utils -dnf5 +microdnf glibc-minimal-langpack grubby kernel