summaryrefslogtreecommitdiffstats
path: root/kdf
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-02-17 12:43:57 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-17 12:45:49 +0100
commit63d18453b7d2de671655463c02d9f7f16302c7a3 (patch)
treec1b4062cfc463535c47b593e5b1952fc89c028d8 /kdf
parentd8c2c124056dd428a71f48aab5163695eaa6f065 (diff)
downloadtdeutils-63d18453b7d2de671655463c02d9f7f16302c7a3.tar.gz
tdeutils-63d18453b7d2de671655463c02d9f7f16302c7a3.zip
kdf: ignores 'LABEL=' lines
(legacy RedHat patch) (cherry picked from commit 31a0d1795d28d56e26ea5682a557753dd420a1ab)
Diffstat (limited to 'kdf')
-rw-r--r--kdf/disklist.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index abec1b8..74234c0 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -183,8 +183,9 @@ TQFile f(FSTAB);
while (! t.eof()) {
s=t.readLine();
s=s.simplifyWhiteSpace();
- if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) ) {
+ if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) && (s.find("LABEL=")!=0) ) {
// not empty or commented out by '#'
+ // skip LABEL entries as long as kdf can't handle them properly
// kdDebug() << "GOT: [" << s << "]" << endl;
disk = new DiskEntry();// Q_CHECK_PTR(disk);
disk->setMounted(FALSE);