From 00d2d7eeb0dd3e0ff85624ac5586d67be525aaaf Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 12 May 2010 14:00:18 +0200 Subject: [PATCH] =?UTF-8?q?Bug=2028075=20=E2=80=94=20Do=20not=20have=20all=20files=20executable=20on=20vfat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable the "showexec" vfat mount option, to avoid data files being executable (which causes confusing question dialogs in nautilus which only have one sensible answer). See http://www.kernel.org/doc/Documentation/filesystems/vfat.txt (search for "showexec") for the details of this option. --- src/device.c | 4 ++-- tests/run | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/device.c b/src/device.c index 12cab7c..763385c 100644 --- a/src/device.c +++ b/src/device.c @@ -5848,8 +5848,8 @@ typedef struct /* ---------------------- vfat -------------------- */ -static const char *vfat_defaults[] = { "uid=", "gid=", "shortname=mixed", "dmask=0077", "utf8=1", NULL }; -static const char *vfat_allow[] = { "flush", "utf8=", "shortname=", "umask=", "dmask=", "fmask=", "codepage=", "iocharset=", "usefree", NULL }; +static const char *vfat_defaults[] = { "uid=", "gid=", "shortname=mixed", "dmask=0077", "utf8=1", "showexec", NULL }; +static const char *vfat_allow[] = { "flush", "utf8=", "shortname=", "umask=", "dmask=", "fmask=", "codepage=", "iocharset=", "usefree", "showexec", NULL }; static const char *vfat_allow_uid_self[] = { "uid=", NULL }; static const char *vfat_allow_gid_self[] = { "gid=", NULL }; diff --git a/tests/run b/tests/run index acba8b1..f47015d 100755 --- a/tests/run +++ b/tests/run @@ -51,7 +51,7 @@ test_md_dev = '/dev/md125' # Those file systems are known to have a broken handling of permissions, in # particular the executable bit -BROKEN_PERMISSIONS_FS = ['vfat', 'ntfs'] +BROKEN_PERMISSIONS_FS = ['ntfs'] # Some D-BUS API methods cause properties to not be up to date yet when a # method call finishes, thus we do an udevadm settle as a workaround. Those -- 1.7.0.4