sane-wipe: port from systemd -> s6
This commit is contained in:
parent
5ed29ceb47
commit
eadb2057d9
|
@ -254,7 +254,8 @@ in
|
|||
|
||||
"sane-scripts.wipe".sandbox = {
|
||||
method = "bwrap";
|
||||
whitelistDbus = [ "user" ]; #< for `secret-tool` and `systemd --user stop <service>
|
||||
whitelistDbus = [ "user" ]; #< for `secret-tool`
|
||||
whitelistS6 = true; #< for stopping services before wiping
|
||||
extraHomePaths = [
|
||||
# could be more specific, but at a maintenance cost.
|
||||
# TODO: needs updating, now that persisted data lives behind symlinks!
|
||||
|
|
|
@ -201,7 +201,7 @@ let
|
|||
wipe = static-nix-shell.mkBash {
|
||||
pname = "sane-wipe";
|
||||
srcRoot = ./src;
|
||||
pkgs = [ "dconf" "libsecret" "systemd" ];
|
||||
pkgs = [ "dconf" "libsecret" "s6-rc" ];
|
||||
};
|
||||
};
|
||||
in sane-bin // {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p dconf -p libsecret -p systemd
|
||||
#!nix-shell -i bash -p dconf -p libsecret -p s6-rc
|
||||
|
||||
help() {
|
||||
echo "usage: sane-wipe <resource>"
|
||||
|
@ -52,7 +52,7 @@ wipe_flare() {
|
|||
}
|
||||
|
||||
wipe_fractal() {
|
||||
systemctl --user stop fractal
|
||||
s6-rc stop fractal
|
||||
|
||||
# first, ensure the relevant secrets are unlocked
|
||||
secret-tool search --all --unlock 'xdg:schema' 'org.gnome.Fractal'
|
||||
|
|
Loading…
Reference in New Issue