diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-03-14 11:30:04 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-03-14 11:30:04 +0000 |
| commit | e8415d22f9a1648e763cdee0a15068bb0913de57 (patch) | |
| tree | 4ac13bba0c2850dc2f26a3b9b62b440f1a30feaa | |
| parent | cfebb4f25968458489c41ace517e52de9708aee9 (diff) | |
| download | gvfs-e8415d22f9a1648e763cdee0a15068bb0913de57.tar.gz | |
Don't autostart fuse backend if the GVFS_DISABLE_FUSE env var is set
2008-03-14 Alexander Larsson <alexl@redhat.com>
* daemon/main.c:
Don't autostart fuse backend if the GVFS_DISABLE_FUSE
env var is set
svn path=/trunk/; revision=1656
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | daemon/main.c | 4 |
2 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,11 @@ 2008-03-14 Alexander Larsson <alexl@redhat.com> + * daemon/main.c: + Don't autostart fuse backend if the GVFS_DISABLE_FUSE + env var is set + +2008-03-14 Alexander Larsson <alexl@redhat.com> + * hal/ghalvolume.c (g_hal_volume_new): Respect storage.automount_enabled_hint hal property (#520736) Patch from Martin Pitt diff --git a/daemon/main.c b/daemon/main.c index 79f361a1..660e9aa6 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -66,6 +66,10 @@ main (int argc, char *argv[]) replace = FALSE; no_fuse = FALSE; + + if (g_getenv ("GVFS_DISABLE_FUSE") != NULL) + no_fuse = TRUE; + error = NULL; if (!g_option_context_parse (context, &argc, &argv, &error)) { |