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

Fix davfs entries being omitted from fstab file. 

BUG: 447961
This commit is contained in:
Andrius Štikonas 2022-01-05 23:00:17 +00:00
parent e58ab02bac
commit 5ffc5c6f23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/fstab.cpp
View File

@ -240,7 +240,8 @@ static QString findBlkIdDevice(const char *token, const QString& value)
static void parseFsSpec(const QString& m_fsSpec, FstabEntry::Type& m_entryType, QString& m_deviceNode)
{
m_entryType = FstabEntry::Type::comment;
m_entryType = FstabEntry::Type::other;
m_deviceNode = m_fsSpec;
if (m_fsSpec.startsWith(QStringLiteral("UUID="))) {
m_entryType = FstabEntry::Type::uuid;
m_deviceNode = findBlkIdDevice("UUID", QString(m_fsSpec).remove(QStringLiteral("UUID=")));
@ -255,7 +256,8 @@ static void parseFsSpec(const QString& m_fsSpec, FstabEntry::Type& m_entryType,
m_deviceNode = findBlkIdDevice("PARTLABEL", QString(m_fsSpec).remove(QStringLiteral("PARTLABEL=")));
} else if (m_fsSpec.startsWith(QStringLiteral("/"))) {
m_entryType = FstabEntry::Type::deviceNode;
m_deviceNode = m_fsSpec;
} else if (m_fsSpec.isEmpty()) {
m_entryType = FstabEntry::Type::comment;
}
}

2
src/core/fstab.h
View File

@ -26,7 +26,7 @@ struct FstabEntryPrivate;
class LIBKPMCORE_EXPORT FstabEntry
{
public:
enum class Type { deviceNode, uuid, label, partlabel, partuuid, comment };
enum class Type { deviceNode, uuid, label, partlabel, partuuid, comment, other };
FstabEntry(const QString& fsSpec, const QString& mountPoint, const QString& type, const QString& options, int dumpFreq = 0, int passNumber = 0, const QString& comment = QString());