From 0ef0abf62c0a9f1c083ae00f39b4149d4b8e98cb Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Mar 2026 18:33:03 +0100 Subject: Use gasroot instead of asroot when not in foreground MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- element-desktop/mount-element | 6 +++++- element-desktop/umount-element | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'element-desktop') diff --git a/element-desktop/mount-element b/element-desktop/mount-element index 1d3c03c..311d6ea 100755 --- a/element-desktop/mount-element +++ b/element-desktop/mount-element @@ -3,7 +3,11 @@ if mountpoint -q -- "${HOME}/.var/opt/element/ElementCrypt.d"; then printf '%s\n' 'mount-element: already mounted' >&2 elif test -e /dev/mapper/ElementCrypt; then - asroot env ELEMENT_DIR="${HOME}/.var/opt/element" sh -ec \ + asroot=asroot + if ! isfg; then + asroot=gasroot + fi + $asroot env ELEMENT_DIR="${HOME}/.var/opt/element" sh -ec \ 'mount -- /dev/mapper/ElementCrypt "${ELEMENT_DIR}/ElementCrypt.d"' else gpg --decrypt -- "${HOME}/.var/opt/element/ElementCrypt.key" | \ diff --git a/element-desktop/umount-element b/element-desktop/umount-element index 44d425b..ddfc602 100755 --- a/element-desktop/umount-element +++ b/element-desktop/umount-element @@ -1,6 +1,11 @@ #!/bin/dash -asroot env \ +asroot=asroot +if ! isfg; then + asroot=gasroot +fi + +$asroot env \ ELEMENT_DIR="${HOME}/.var/opt/element" \ ELEMENT_DEV="$(losetup | sed 's/\s\+/ /g' | cut -d ' ' -f 1,6 | \ sed -n 's#\(/[^ ]*\) '"$(realpath -- "${HOME}/.var/opt/element/ElementCrypt.img")"'$#\1#p' | sed 1q)" \ -- cgit v1.2.3-70-g09d2