From 86fdcfb160940c5b27e70cb81b4b3ba24f98aee2 Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Mon, 29 Apr 2024 11:48:00 -0400 Subject: [PATCH] Replace dnf with dnf5 --- fedora-cloud-base-vagrant.ks | 6 ------ fedora-container-base-minimal.ks | 2 +- fedora-container-base.ks | 3 +-- fedora-container-toolbox.ks | 5 ++--- fedora-eln-container-base.ks | 6 +----- fedora-eln-guest.ks | 3 +-- 6 files changed, 6 insertions(+), 19 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 47fd2cb..1b15ce5 100644 --- a/fedora-container-base-minimal.ks +++ b/fedora-container-base-minimal.ks @@ -1,5 +1,5 @@ # 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 diff --git a/fedora-container-base.ks b/fedora-container-base.ks index dc965ec..6c6e1bc 100644 --- a/fedora-container-base.ks +++ b/fedora-container-base.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 4d6fdc3..cc7477e 100644 --- a/fedora-container-toolbox.ks +++ b/fedora-container-toolbox.ks @@ -28,9 +28,8 @@ coreutils-common curl default-editor diffutils -dnf -dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 -dnf-plugins-core +dnf5 +dnf5-plugins -dosfstools -e2fsprogs fedora-release-toolbx diff --git a/fedora-eln-container-base.ks b/fedora-eln-container-base.ks index 64e5f2a..46b1156 100644 --- a/fedora-eln-container-base.ks +++ b/fedora-eln-container-base.ks @@ -11,11 +11,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 -python3-dnf-plugins-core # https://github.com/fedora-eln/eln/issues/166 - -dnf5 # https://github.com/fedora-eln/eln/issues/175 +dnf5 dnf5-plugins sudo diff --git a/fedora-eln-guest.ks b/fedora-eln-guest.ks index c9e2955..6414d53 100644 --- a/fedora-eln-guest.ks +++ b/fedora-eln-guest.ks @@ -32,11 +32,10 @@ reboot # Packages %packages @core -dnf +dnf5 kernel yum nfs-utils -dnf-utils # pull firmware packages out -aic94xx-firmware