asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11276 from hpvb/fix-11270

Browse source 
Only do 'drive' discovery on X11
This commit is contained in:
Rémi Verschelde 2017-09-17 18:44:25 +02:00 committed by GitHub
commit 07d18a0076
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/unix/dir_access_unix.cpp
View file

@ -183,17 +183,18 @@ void DirAccessUnix::list_dir_end() {
_cisdir = false; _cisdir = false;
} }
#ifdef HAVE_MNTENT #if defined(HAVE_MNTENT) && defined(X11_ENABLED)
static bool _filter_drive(struct mntent *mnt) { static bool _filter_drive(struct mntent *mnt) {
// Ignore devices that don't point to /dev // Ignore devices that don't point to /dev
if (strncmp(mnt->mnt_fsname, "/dev", 4) != 0) { if (strncmp(mnt->mnt_fsname, "/dev", 4) != 0) {
return false; return false;
} }
// Accept devices mounted at /media, /mnt or /home // Accept devices mounted at common locations
if (strncmp(mnt->mnt_dir, "/media", 6) == 0 || if (strncmp(mnt->mnt_dir, "/media", 6) == 0 ||
strncmp(mnt->mnt_dir, "/mnt", 4) == 0 || strncmp(mnt->mnt_dir, "/mnt", 4) == 0 ||
strncmp(mnt->mnt_dir, "/home", 5) == 0) { strncmp(mnt->mnt_dir, "/home", 5) == 0 ||
strncmp(mnt->mnt_dir, "/run/media", 10) == 0) {
return true; return true;
} }
@ -204,7 +205,7 @@ static bool _filter_drive(struct mntent *mnt) {
static void _get_drives(List<String> *list) { static void _get_drives(List<String> *list) {
#ifdef HAVE_MNTENT #if defined(HAVE_MNTENT) && defined(X11_ENABLED)
// Check /etc/mtab for the list of mounted partitions // Check /etc/mtab for the list of mounted partitions
FILE *mtab = setmntent("/etc/mtab", "r"); FILE *mtab = setmntent("/etc/mtab", "r");
if (mtab) { if (mtab) {