Commit dbd510d7 authored by Tomi Leppänen's avatar Tomi Leppänen

Merge branch 'jb50211_skip_rootfs' into 'mer-5.6'

[qtbase] Skip rootfs in QStorageInfo. Contributes to JB#50211

See merge request !62
parents d63a8c6c 78b606fc
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment