From d84d3e61e05160b43e12345d90f36e69d8b108fa Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Fri, 23 Jun 2023 18:23:54 +0000 Subject: [PATCH] Replace dnf with dnf5 --- fedora-cloud-base-vagrant.ks | 6 ------ fedora-container-base-minimal.ks | 3 ++- fedora-container-base.ks | 5 ++--- fedora-container-toolbox.ks | 5 ++--- fedora-eln-container-base.ks | 5 ++--- fedora-eln-guest.ks | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/fedora-cloud-base-vagrant.ks b/fedora-cloud-base-vagrant.ks index 7452a53..8313d3d 100644 --- a/fedora-cloud-base-vagrant.ks +++ b/fedora-cloud-base-vagrant.ks @@ -22,12 +22,6 @@ 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 3cd1473..ae0b19e 100644 --- a/fedora-container-base-minimal.ks +++ b/fedora-container-base-minimal.ks @@ -1,10 +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/dnf. +# This base is a stripped back Fedora image without python3. # 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 %end diff --git a/fedora-container-base.ks b/fedora-container-base.ks index dc965ec..2269faa 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 dnf +# This base is a standard Fedora image with python3 and dnf5 %include fedora-container-common.ks @@ -7,8 +7,7 @@ rootfiles tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 vim-minimal -dnf -dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 +dnf5 sudo -glibc-langpack-en -langpacks-en diff --git a/fedora-container-toolbox.ks b/fedora-container-toolbox.ks index 9f9b298..838494f 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 dnf +# This base is a standard Fedora image with python3 and dnf5 %include fedora-container-common.ks @@ -10,8 +10,7 @@ rootfiles tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 vim-enhanced -dnf -dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 +dnf5 sudo -glibc-minimal-langpack -glibc-all-langpacks diff --git a/fedora-eln-container-base.ks b/fedora-eln-container-base.ks index f14e7f6..3aa0ed4 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 dnf +# This base is a standard Fedora-ELN image with python3 and dnf5 %include fedora-container-common.ks @@ -10,8 +10,7 @@ fedora-repos-eln rootfiles tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 vim-minimal -dnf -dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 +dnf5 sudo -glibc-langpack-en -langpacks-en diff --git a/fedora-eln-guest.ks b/fedora-eln-guest.ks index ce2b301..64815e1 100644 --- a/fedora-eln-guest.ks +++ b/fedora-eln-guest.ks @@ -32,7 +32,7 @@ reboot # Packages %packages @core -dnf +dnf5 kernel yum nfs-utils