From 39a50823bc89757c5a056674a4fefcf146dea7d2 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 27 Jul 2014 20:26:36 +0000 Subject: [PATCH] filter out x-systemd.automount git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15116 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/disk/disk.c | 9 +++++++-- 1 file 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; }