Adjust configs for SwitchToDnf5 Change
dnf5 (in obsoleting-dnf mode) provides /usr/bin/yum and obsoletes yum, so we should drop the 'dnf-yum' entries (which installed yum). dnf5 also appears to provide and obsolete microdnf, so we should replace microdnf with dnf5 in the minimal image, I guess. dnf5-plugins seems the logical replacement for dnf-plugins-core (which is not removed yet, but is specific to dnf4). Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
9e7435cee5
commit
678ee6243c
@ -8,7 +8,7 @@
|
||||
</description>
|
||||
<preferences>
|
||||
<version>Rawhide</version>
|
||||
<packagemanager>dnf</packagemanager>
|
||||
<packagemanager>dnf5</packagemanager>
|
||||
<locale>en_US</locale>
|
||||
<keytable>us</keytable>
|
||||
<timezone>UTC</timezone>
|
||||
|
@ -130,7 +130,7 @@
|
||||
<ignore name="glibc-langpack-en"/>
|
||||
<ignore name="langpacks-en"/>
|
||||
<ignore name="tzdata"/>
|
||||
<package name="microdnf"/>
|
||||
<package name="dnf5"/>
|
||||
<package name="glibc-minimal-langpack"/>
|
||||
</packages>
|
||||
<packages type="bootstrap" profiles="Container-Base-Generic">
|
||||
@ -142,8 +142,7 @@
|
||||
<package name="rootfiles"/>
|
||||
<package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 -->
|
||||
<package name="vim-minimal"/>
|
||||
<package name="dnf"/>
|
||||
<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
|
||||
<package name="dnf5"/>
|
||||
<package name="glibc-minimal-langpack"/>
|
||||
<package name="tzdata"/>
|
||||
<package name="xz"/>
|
||||
@ -178,9 +177,8 @@
|
||||
<package name="curl"/>
|
||||
<package name="default-editor"/>
|
||||
<package name="diffutils"/>
|
||||
<package name="dnf"/>
|
||||
<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
|
||||
<package name="dnf-plugins-core"/>
|
||||
<package name="dnf5"/>
|
||||
<package name="dnf5-plugins"/>
|
||||
<package name="fedora-release-toolbx"/>
|
||||
<package name="file"/>
|
||||
<package name="findutils"/>
|
||||
|
@ -58,7 +58,6 @@
|
||||
<user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
|
||||
</users>
|
||||
<packages type="image" patternType="plusRecommended" profiles="VagrantCore">
|
||||
<package name="dnf-yum"/>
|
||||
<package name="rsync"/>
|
||||
<package name="fuse-sshfs"/>
|
||||
<package name="gdisk"/>
|
||||
|
Loading…
Reference in New Issue
Block a user