Replace dnf with dnf5

This commit is contained in:
Evan Goode 2023-06-23 18:23:54 +00:00 committed by humaton
parent 41a8487712
commit d84d3e61e0
6 changed files with 9 additions and 17 deletions

View File

@ -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" bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
%packages %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 # 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 # users setup. This can actually take a bit of time. Just fold it
# in to the base box disk image # in to the base box disk image

View File

@ -1,10 +1,11 @@
# See fedora-container-common.ks for details on how to hack on container image kickstarts # 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. # If you need that use the standard base image.
%include fedora-container-common.ks %include fedora-container-common.ks
%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
# DNF 5 replaces microdnf in Fedora 39+.
dnf5 dnf5
%end %end

View File

@ -1,5 +1,5 @@
# See fedora-container-common.ks for details on how to hack on container image kickstarts # 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 %include fedora-container-common.ks
@ -7,8 +7,7 @@
rootfiles rootfiles
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal vim-minimal
dnf dnf5
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
sudo sudo
-glibc-langpack-en -glibc-langpack-en
-langpacks-en -langpacks-en

View File

@ -1,7 +1,7 @@
# Kickstart file for Fedora Toolbox # Kickstart file for Fedora Toolbox
# See fedora-container-common.ks for details on how to hack on container image kickstarts # 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 %include fedora-container-common.ks
@ -10,8 +10,7 @@
rootfiles rootfiles
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-enhanced vim-enhanced
dnf dnf5
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
sudo sudo
-glibc-minimal-langpack -glibc-minimal-langpack
-glibc-all-langpacks -glibc-all-langpacks

View File

@ -1,5 +1,5 @@
# See fedora-container-common.ks for details on how to hack on container image kickstarts # 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 %include fedora-container-common.ks
@ -10,8 +10,7 @@ fedora-repos-eln
rootfiles rootfiles
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal vim-minimal
dnf dnf5
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
sudo sudo
-glibc-langpack-en -glibc-langpack-en
-langpacks-en -langpacks-en

View File

@ -32,7 +32,7 @@ reboot
# Packages # Packages
%packages %packages
@core @core
dnf dnf5
kernel kernel
yum yum
nfs-utils nfs-utils