From d349ef82b8462517120dd244d858ca6315ac2f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 28 Aug 2023 21:01:00 +0200 Subject: [PATCH 1/2] Add forgotten admin.vm.volume.Clear service --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d889f6235..3bea491f0 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,7 @@ ADMIN_API_METHODS_SIMPLE = \ admin.vm.tag.List \ admin.vm.tag.Remove \ admin.vm.tag.Set \ + admin.vm.volume.Clear \ admin.vm.volume.CloneFrom \ admin.vm.volume.CloneTo \ admin.vm.volume.Info \ From 59e9d7fd19e3f13b762b6cc91f8a5660b632b0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 28 Aug 2023 21:01:17 +0200 Subject: [PATCH 2/2] Do replace default policy on upgrade They have comments at the beginning already, that user should not modify them. Do update them with the package to properly handle upgrades. Fixes QubesOS/qubes-issues#8458 --- rpm_spec/core-dom0.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in index ca45aaf73..021bcc810 100644 --- a/rpm_spec/core-dom0.spec.in +++ b/rpm_spec/core-dom0.spec.in @@ -548,9 +548,9 @@ done /usr/lib/tmpfiles.d/qubes.conf %attr(0755,root,root) /usr/lib/qubes/create-snapshot %attr(0755,root,root) /usr/lib/qubes/destroy-snapshot -%attr(0664,root,qubes) %config(noreplace) /etc/qubes/policy.d/85-admin-backup-restore.policy -%attr(0664,root,qubes) %config(noreplace) /etc/qubes/policy.d/90-admin-default.policy -%attr(0664,root,qubes) %config(noreplace) /etc/qubes/policy.d/90-default.policy +%attr(0664,root,qubes) %config /etc/qubes/policy.d/85-admin-backup-restore.policy +%attr(0664,root,qubes) %config /etc/qubes/policy.d/90-admin-default.policy +%attr(0664,root,qubes) %config /etc/qubes/policy.d/90-default.policy %attr(0664,root,qubes) %config(noreplace) /etc/qubes/policy.d/include/admin-global-ro %attr(0664,root,qubes) %config(noreplace) /etc/qubes/policy.d/include/admin-global-rwx %attr(0664,root,qubes) %config(noreplace) /etc/qubes/policy.d/include/admin-local-ro