summaryrefslogtreecommitdiff
path: root/libgphoto2_port
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2014-07-27 20:26:36 +0000
committerMarcus Meissner <marcus@jet.franken.de>2014-07-27 20:26:36 +0000
commit39a50823bc89757c5a056674a4fefcf146dea7d2 (patch)
tree33b3aed8a2d1f0adf214e419fa52eaa78ed7f90b /libgphoto2_port
parentb7b57e79e273acba3b2199307ccc797c199b195d (diff)
downloadlibgphoto2-39a50823bc89757c5a056674a4fefcf146dea7d2.tar.gz
filter out x-systemd.automount
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15116 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port')
-rw-r--r--libgphoto2_port/disk/disk.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libgphoto2_port/disk/disk.c b/libgphoto2_port/disk/disk.c
index 52ae5e466..9d722fdcf 100644
--- a/libgphoto2_port/disk/disk.c
+++ b/libgphoto2_port/disk/disk.c
@@ -130,7 +130,10 @@ gp_port_library_list (GPPortInfoList *list)
(NULL != strstr(mntent->mnt_type,"sysfs"))||
(NULL != strstr(mntent->mnt_type,"fuse"))||
(NULL != strstr(mntent->mnt_type,"cifs"))||
- (NULL != strstr(mntent->mnt_type,"afs"))
+ (NULL != strstr(mntent->mnt_type,"afs")) ||
+ /* mount options */
+ /* x-systemd.automount or similar */
+ (NULL != strstr(mntent->mnt_opts,"automount"))
)
) {
continue;
@@ -191,7 +194,9 @@ gp_port_library_list (GPPortInfoList *list)
(NULL != strstr(mntent->mnt_type,"sysfs"))||
(NULL != strstr(mntent->mnt_type,"fuse"))||
(NULL != strstr(mntent->mnt_type,"cifs"))||
- (NULL != strstr(mntent->mnt_type,"afs"))
+ (NULL != strstr(mntent->mnt_type,"afs")) ||
+ /* options */
+ (NULL != strstr(mntent->mnt_opts,"automount"))
) {
continue;
}