Merge branch 'jb50211_skip_rootfs' into 'mer-5.6'

[qtbase] Skip rootfs in QStorageInfo. Contributes to JB#50211 See merge request mer-core/qtbase!62
sailfishos · Jun 30, 2020 · dbd510d · dbd510d
2 parents d63a8c6 + 78b606f
commit dbd510d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
@@ -459,7 +459,10 @@ void QStorageInfoPrivate::initRootPath()
         const QString mountDir = it.rootPath();
         const QByteArray fsName = it.fileSystemType();
         // we try to find most suitable entry
-        if (isParentOf(mountDir, oldRootPath) && maxLength < mountDir.length()) {
+        if (isParentOf(mountDir, oldRootPath)
+                && (maxLength < mountDir.length()
+                    // Alternative device that's not rootfs, overwrites pivoted root
+                    || (rootPath == mountDir && device == "rootfs"))) {
             maxLength = mountDir.length();
             rootPath = mountDir;
             device = it.device();