andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

LABEL and UUID in /etc/fstab have to be uppercase. 

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=964192
This commit is contained in:
Volker Lanz 2009-05-06 10:08:43 +00:00
parent fb0791ce0f
commit 9a1a21f3e7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/libparted.cpp
View File

@ -63,7 +63,7 @@ static PedExceptionOption pedExceptionHandler(PedException* e)
*/
static QString findUuidDevice(const QString& s)
{
const QString filename = "/dev/disk/by-uuid/" + QString(s).remove("UUID=", Qt::CaseInsensitive);
const QString filename = "/dev/disk/by-uuid/" + QString(s).remove("UUID=");
return QFile::exists(filename) ? QFile::symLinkTarget(filename) : "";
}
@ -73,7 +73,7 @@ static QString findUuidDevice(const QString& s)
*/
static QString findLabelDevice(const QString& s)
{
const QString filename = "/dev/disk/by-label/" + QString(s).remove("LABEL=", Qt::CaseInsensitive);
const QString filename = "/dev/disk/by-label/" + QString(s).remove("LABEL=");
return QFile::exists(filename) ? QFile::symLinkTarget(filename) : "";
}
@ -94,10 +94,10 @@ static void readMountpoints(const QString& filename, QMap<QString, QStringList>&
{
QString device = p->mnt_fsname;
if (device.startsWith("UUID=", Qt::CaseInsensitive))
if (device.startsWith("UUID="))
device = findUuidDevice(device);
if (device.startsWith("LABEL=", Qt::CaseInsensitive))
if (device.startsWith("LABEL="))
device = findLabelDevice(device);
if (!device.isEmpty())