+Options for '--sandbox-server' and '--bug-pathname' for all entries.

diff --git a/src/client/gnomevfs/captive.conf.in b/src/client/gnomevfs/captive.conf.in
index 2f1760a..32ff37b 100644 (file)
--- a/src/client/gnomevfs/captive.conf.in
+++ b/src/client/gnomevfs/captive.conf.in
@@ -1,39 +1,59 @@
-captive-cdfs: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/cdfs.sys --cdrom --ro
+captive-ntfs: libcaptive-gnomevfs \
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/ntfs.sys --disk --rw \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
+
+captive-ntfs-ro: libcaptive-gnomevfs \
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/ntfs.sys --disk --ro \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
+
+captive-ntfs-blind: libcaptive-gnomevfs \
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/ntfs.sys --disk --blind \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
 
 captive-fastfat: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/fastfat.sys --disk --rw
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/fastfat.sys --disk --rw \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
 
 captive-fastfat-ro: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/fastfat.sys --disk --ro
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/fastfat.sys --disk --ro \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
 
 captive-fastfat-blind: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/fastfat.sys --disk --blind
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/fastfat.sys --disk --blind \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
+
+captive-cdfs: libcaptive-gnomevfs \
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/cdfs.sys --cdrom --ro \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
 
 captive-ext2fsd: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/ext2fsd.sys --disk --rw
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/ext2fsd.sys --disk --rw \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
 
 captive-ext2fsd-ro: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/ext2fsd.sys --disk --ro
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/ext2fsd.sys --disk --ro \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz
 
 captive-ext2fsd-blind: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/ext2fsd.sys --disk --blind
-
-captive-ntfs: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntfs.sys --disk --rw
-
-captive-ntfs-ro: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntfs.sys --disk --ro
-
-captive-ntfs-blind: libcaptive-gnomevfs \
-               --load-module=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntoskrnl.exe \
-                --filesystem=@sysconfdir@/gnome-vfs-2.0/modules/captive/ntfs.sys --disk --blind
+               --load-module=@localstatedir@/lib/captive/ntoskrnl.exe \
+                --filesystem=@localstatedir@/lib/captive/ext2fsd.sys --disk --blind \
+               --sandbox-server=@sbindir@/captive-sandbox-server \
+               --bug-pathname=@localstatedir@/lib/captive/bug-%FT%T.captivebug.xml.gz