From 86e0dc18cf8acf229ce92bb37f70b29002e53d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 26 Feb 2019 11:38:44 +0100 Subject: [PATCH] Use dnf instead of yum I left the instructions for yum-langpacks around, because I'm not sure how the dnf replacement looks. But all references to yum-the-executable are gone. https://fedoraproject.org/wiki/Changes/Retire_YUM_3 https://bugzilla.redhat.com/show_bug.cgi?id=1682910 --- fedora-cloud-base.ks | 2 +- fedora-cloud-bigdata.ks | 14 +++++++------- fedora-cloud-experimental.ks | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 740c742..a8bc5df 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -137,7 +137,7 @@ echo "Removing firewalld." # not work when package was installed by Anaconda instead of command line. # Also -- check if this is still even needed with new anaconda -- disabled # firewall should _not_ pull in this package. -# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1" +# dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1" dnf -C -y erase "firewalld*" # Another one needed at install time but not after that, and it pulls diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks index fd67c89..0d96e3a 100644 --- a/fedora-cloud-bigdata.ks +++ b/fedora-cloud-bigdata.ks @@ -112,12 +112,12 @@ rpm -e linux-firmware # Remove firewalld; was supposed to be optional in F18+, but is required to # be present for install/image building. echo "Removing firewalld." -yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1" +dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1" # Another one needed at install time but not after that, and it pulls # in some unneeded deps (like, newt and slang) echo "Removing authconfig." -yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1" +dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1" echo -n "Getty fixes" # although we want console output going to the serial console, we don't @@ -176,10 +176,10 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot echo "Removing random-seed so it's not the same in every image." rm -f /var/lib/systemd/random-seed -echo "Cleaning old yum repodata." -yum history new -yum clean all -truncate -c -s 0 /var/log/yum.log +echo "Cleaning old dnf repodata." +dnf history new +dnf clean all +truncate -c -s 0 /var/log/dnf.log echo "Import RPM GPG key" releasever=$(rpm -q --qf '%{version}\n' fedora-release) @@ -204,7 +204,7 @@ dd if=/usr/share/syslinux/mbr.bin of=/dev/vda echo "Fixing SELinux contexts." touch /var/log/cron touch /var/log/boot.log -mkdir -p /var/cache/yum +mkdir -p /var/cache/dnf /usr/sbin/fixfiles -R -a restore echo "Zeroing out empty space." diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks index 16a3499..4f95ff7 100644 --- a/fedora-cloud-experimental.ks +++ b/fedora-cloud-experimental.ks @@ -103,12 +103,12 @@ rpm -e linux-firmware # Remove firewalld; was supposed to be optional in F18+, but is required to # be present for install/image building. echo "Removing firewalld." -yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1" +dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1" # Another one needed at install time but not after that, and it pulls # in some unneeded deps (like, newt and slang) echo "Removing authconfig." -yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1" +dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1" echo -n "Getty fixes" # although we want console output going to the serial console, we don't @@ -167,10 +167,10 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot echo "Removing random-seed so it's not the same in every image." rm -f /var/lib/systemd/random-seed -echo "Cleaning old yum repodata." -yum history new -yum clean all -truncate -c -s 0 /var/log/yum.log +echo "Cleaning old dnf repodata." +dnf history new +dnf clean all +truncate -c -s 0 /var/log/dnf.log echo "Import RPM GPG key" releasever=$(rpm -q --qf '%{version}\n' fedora-release) @@ -196,7 +196,7 @@ dd if=/usr/share/syslinux/mbr.bin of=/dev/vda echo "Fixing SELinux contexts." touch /var/log/cron touch /var/log/boot.log -mkdir -p /var/cache/yum +mkdir -p /var/cache/dnf chattr -i /boot/extlinux/ldlinux.sys /usr/sbin/fixfiles -R -a restore chattr +i /boot/extlinux/ldlinux.sys