Merge branch 'devel20230828'

* devel20230828: Do replace default policy on upgrade Add forgotten admin.vm.volume.Clear service
QubesOS · Oct 11, 2023 · 64a0da7 · 64a0da7
2 parents 7b8e09b + 59e9d7f
commit 64a0da7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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 \

diff --git 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