yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UI: fix installer workflow asking for sudo pw in background

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-12-29 13:00:40 +01:00
parent b75ddec89a
commit a1c640db3d
4 changed files with 83 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/clan-cli/clan_cli/flash/automount.py
View File

@@ -7,13 +7,14 @@ from pathlib import Path
from clan_cli.cmd import Log, RunOpts, run
from clan_cli.errors import ClanError
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_shell
log = logging.getLogger(__name__)
@contextmanager
def pause_automounting(
devices: list[Path], machine: Machine
devices: list[Path], machine: Machine, sudo: str = "pkexec"
) -> Generator[None, None, None]:
"""
Pause automounting on the device for the duration of this context
@@ -32,7 +33,11 @@ def pause_automounting(
raise ClanError(msg)
str_devs = [str(dev) for dev in devices]
cmd = ["sudo", str(inhibit_path), "enable", *str_devs]
cmd = nix_shell(
["nixpkgs#pkexec"] if sudo == "pkexec" else [],
[sudo, str(inhibit_path), "enable", *str_devs],
)
result = run(
cmd,
RunOpts(
@@ -42,7 +47,7 @@ def pause_automounting(
if result.returncode != 0:
machine.error("Failed to inhibit automounting")
yield None
cmd = ["sudo", str(inhibit_path), "disable", *str_devs]
cmd = [sudo, str(inhibit_path), "disable", *str_devs]
result = run(cmd, RunOpts(log=Log.BOTH, check=False, prefix=machine.name))
if result.returncode != 0:
machine.error("Failed to re-enable automounting")