chore: Ship two configs, one which can be run by every user and anoth…

…er which can be executed by the root user
ublue-os · Jan 23, 2024 · 0ad3ced · 0ad3ced
1 parent 8ebf6ab
commit 0ad3ced
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/files/usr/etc/ublue-update/topgrade-system.toml b/files/usr/etc/ublue-update/topgrade-system.toml
@@ -0,0 +1,10 @@
+[misc]
+only = ["system", "flatpak"]
+ignore_failures = ["flatpak"]
+skip_notify = true
+assume_yes = true
+no_retry = true
+no_self_update = true
+
+[linux]
+rpm_ostree = true
diff --git a/files/usr/etc/ublue-update/topgrade.toml → ...s/usr/etc/ublue-update/topgrade-user.toml b/files/usr/etc/ublue-update/topgrade.toml → ...s/usr/etc/ublue-update/topgrade-user.toml
@@ -1,10 +1,13 @@
 [misc]
-only = ["system", "flatpak", "distrobox"]
+only = ["flatpak", "distrobox"]
 ignore_failures = ["flatpak", "distrobox"]
 skip_notify = true
 assume_yes = true
 no_retry = true
 no_self_update = true
 
-[linux]
-rpm_ostree = true
+[distrobox]
+use_root = false
+
+[flatpak]
+use_sudo = false
diff --git a/ublue-update.spec b/ublue-update.spec
@@ -71,8 +71,7 @@ fi
 %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system/%{NAME}.service
 %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system/%{NAME}.timer
 %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system-preset/00-%{NAME}.preset
-%attr(0644,root,root) %{_exec_prefix}/etc/%{NAME}/%{NAME}.toml
-%attr(0644,root,root) %{_exec_prefix}/etc/%{NAME}/topgrade.toml
+%attr(0644,root,root) %{_exec_prefix}/etc/%{NAME}/*.toml
 %attr(0644,root,root) %{_exec_prefix}/etc/polkit-1/rules.d/%{NAME}.rules
 
 %changelog