Merge pull request #19374 from Dr15Jones/backportLinxContainerFix_5_3

Use /proc/self/mounts instead of /etc/mtab
cms-sw · Jun 25, 2017 · 7f06911 · 7f06911
2 parents 6d3ea6e + c2c376e
commit 7f06911
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Utilities/StorageFactory/src/LocalFileSystem.cc b/Utilities/StorageFactory/src/LocalFileSystem.cc
@@ -223,13 +223,14 @@ LocalFileSystem::initFSList(void)
 
   free(mtab);
 #else
+  const char * const _PATH_MOUNTED_LINUX = "/proc/self/mounts";
   struct mntent *m;
-  FILE *mtab = setmntent(_PATH_MOUNTED, "r");
+  FILE *mtab = setmntent(_PATH_MOUNTED_LINUX, "r");
   if (! mtab)
   {
     int nerr = errno;
     edm::LogWarning("LocalFileSystem::initFSList()")
-      << "Cannot read '" << _PATH_MOUNTED << "': "
+      << "Cannot read '" << _PATH_MOUNTED_LINUX << "': "
       << strerror(nerr) << " (error " << nerr << ")";
     return -1;
   }