summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2021-01-03 13:47:04 +0000
committerAlexander Larsson <alexander.larsson@gmail.com>2021-01-11 11:07:26 +0100
commitafe7f2bf78b97579c652989d2577d05229f56256 (patch)
treed3aa519f94c7a1f758af0615272ccb3925b0bef4
parentf69a35ceec7322e02007b45d676e0b6f1e9376b0 (diff)
downloadflatpak-afe7f2bf78b97579c652989d2577d05229f56256.tar.gz
env.d, profile.d: Disable gvfs plugins during login
This avoids gvfs-daemon being started when logging in as root via ssh. Bug-Debian: https://bugs.debian.org/975710
-rwxr-xr-xenv.d/60-flatpak1
-rwxr-xr-xenv.d/60-flatpak-system-only1
-rw-r--r--profile/flatpak.csh2
3 files changed, 3 insertions, 1 deletions
diff --git a/env.d/60-flatpak b/env.d/60-flatpak
index 9b98ab57..cccd9dfe 100755
--- a/env.d/60-flatpak
+++ b/env.d/60-flatpak
@@ -1,2 +1,3 @@
#!/bin/sh
+export GIO_USE_VFS=local
exec flatpak --print-updated-env
diff --git a/env.d/60-flatpak-system-only b/env.d/60-flatpak-system-only
index 0dfcc2d6..e7ea28dc 100755
--- a/env.d/60-flatpak-system-only
+++ b/env.d/60-flatpak-system-only
@@ -1,2 +1,3 @@
#!/bin/sh
+export GIO_USE_VFS=local
exec flatpak --print-updated-env --print-system-only
diff --git a/profile/flatpak.csh b/profile/flatpak.csh
index 90b09d0e..7921d5af 100644
--- a/profile/flatpak.csh
+++ b/profile/flatpak.csh
@@ -5,7 +5,7 @@ if ( ${%_flatpak} > 0 ) then
if ( ! ${?XDG_DATA_DIRS} ) setenv XDG_DATA_DIRS /usr/local/share:/usr/share
if ( ${%XDG_DATA_DIRS} == 0 ) setenv XDG_DATA_DIRS /usr/local/share:/usr/share
set _new_dirs=""
- foreach _line (`(unset G_MESSAGES_DEBUG; echo "${XDG_DATA_HOME}"/flatpak; flatpak --installations)`)
+ foreach _line (`(unset G_MESSAGES_DEBUG; echo "${XDG_DATA_HOME}"/flatpak; setenv GIO_USE_VFS local; flatpak --installations)`)
set _line=${_line}/exports/share
if ( ":${XDG_DATA_DIRS}:" =~ *:${_line}:* ) continue
if ( ":${XDG_DATA_DIRS}:" =~ *:${_line}/:* ) continue