Skip to content

Commit facfad3

Browse files
committed
Switch dom0 dnf config to dnf5
1 parent b479add commit facfad3

File tree

3 files changed

+6
-88
lines changed

3 files changed

+6
-88
lines changed

dom0-updates/patch-dnf-yum-config

Lines changed: 0 additions & 85 deletions
This file was deleted.

dom0-updates/protect-qubes.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[main]
2+
reposdir=/etc/yum.real.repos.d
3+
installonlypkgs = kernel, kernel-qubes-vm"

rpm_spec/core-dom0-linux.spec.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
108108
install -m 0755 -D -- dom0-updates/qubes-dom0-updates.cron "$RPM_BUILD_ROOT/etc/cron.daily/qubes-dom0-updates.cron"
109109
install -D dom0-updates/qubes-dom0-update $RPM_BUILD_ROOT/usr/bin/qubes-dom0-update
110110
install -D dom0-updates/qubes-receive-updates $RPM_BUILD_ROOT/usr/libexec/qubes/qubes-receive-updates
111-
install -D dom0-updates/patch-dnf-yum-config $RPM_BUILD_ROOT/usr/lib/qubes/patch-dnf-yum-config
111+
install -m 0644 -D dom0-updates/protect-qubes.conf $RPM_BUILD_ROOT/usr/share/dnf5/libdnf.conf.d/protect-qubes.conf
112112
install -m 0644 -D dom0-updates/qubes-cached.repo $RPM_BUILD_ROOT/etc/yum.real.repos.d/qubes-cached.repo
113113
install -D dom0-updates/qfile-dom0-unpacker $RPM_BUILD_ROOT/usr/libexec/qubes/qfile-dom0-unpacker
114114
install -d $RPM_BUILD_ROOT/etc/qubes-rpc
@@ -210,7 +210,7 @@ fi
210210
%post
211211
set -eo pipefail
212212

213-
/usr/lib/qubes/patch-dnf-yum-config
213+
[ -f /etc/dnf/dnf.conf ]; sed -i -e "/^### QUBES BEGIN ###$/,/^### QUBES END ###$/{d}" /etc/dnf/dnf.conf
214214

215215
systemctl --quiet enable qubes-suspend.service
216216
systemctl --quiet preset usbguard.service
@@ -270,7 +270,7 @@ chmod -x /etc/grub.d/10_linux
270270
/etc/cron.daily/qubes-dom0-updates.cron
271271
/etc/yum.real.repos.d/qubes-cached.repo
272272
%_bindir/qubes-dom0-update
273-
/usr/lib/qubes/patch-dnf-yum-config
273+
/usr/share/dnf5/libdnf.conf.d/protect-qubes.conf
274274
%attr(4750,root,qubes) /usr/libexec/qubes/qfile-dom0-unpacker
275275
/usr/libexec/qubes/qubes-receive-updates
276276
/etc/qubes-rpc/qubes.ReceiveUpdates

0 commit comments

Comments
 (0)