feat(core: sudo; privilege: isolate_root): improve doas support -2

actionless · Jul 20, 2023 · a41e47d · a41e47d
1 parent a9f8758
commit a41e47d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -207,11 +207,7 @@ Comma-separated list of packages names or globs, which upgrade should have addit
 Path to pacman executable.
 
 ##### PrivilegeEscalationTool (default: sudo)
-A tool used to escalate user privileges. If using `doas` then `persistent` option is required in `doas.conf`. For example:
-```
-permit persist :wheel
-```
-Currently supported options are `sudo` and `doas`.
+A tool used to escalate user privileges. Currently supported options are `sudo` and `doas`.
 
 ##### PrivilegeEscalationTarget (default: pikaur)
 Choices: pikaur, pacman.

diff --git a/pikaur/privilege.py b/pikaur/privilege.py
@@ -54,12 +54,13 @@ def isolate_root_cmd(
                 PikaurConfig().misc.PrivilegeEscalationTool.get_str(),
                 "-u", f"{user_id}",
             ]
-        base_root_isolator = [
-            PikaurConfig().misc.PrivilegeEscalationTool.get_str(),
-            f"--user=#{user_id}",
-            "--preserve-env",
-            "--",
-        ]
+        else:
+            base_root_isolator = [
+                PikaurConfig().misc.PrivilegeEscalationTool.get_str(),
+                f"--user=#{user_id}",
+                "--preserve-env",
+                "--",
+            ]
     else:
         base_root_isolator = [
             "/usr/sbin/systemd-run",