Bug#309765: kdebase-kio-plugins: devices:/ uri and labeled mounts

[Guido Guenther <agx@debian.org>]

Package: kdebase-kio-plugins
Version: 4:3.3.2-1
Severity: normal
Tags: patch

Hi,
when one hase labeled mounts in /etc/fstab like:

LABEL=root / ext3 ...

these are listed under the devices:/ kioslave, as:
Harddisk [/]

_and_ also as:

Harddisk (sdaX) [/]

this is because the devices:/ kioslave knows nothing about labeled
mounts. Also when one clicks on the first entry (e.g. in konqueror), one
gets the error message (every time):

mount: according to mtab, /dev/sdaX is already mounted on /

which is annoying and confusing for users.

The easiest solution is to ignore labeled mounts completely
for the moment since the devices are being listed twice anyway.
The attached patch does this.
Cheers,
 -- Guido

P.S.: a more complex solution would be to teach the kioslave about
labeled mounts, but this is harder to do, since we'd have to parse
filesystem labels.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11.9-agx0
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

Versions of packages kdebase-kio-plugins depends on:
ii  kdelibs4                 4:3.3.2-6       KDE core libraries
ii  libart-2.0-2             2.3.17-1        Library of functions for 2D graphi
ii  libc6                    2.3.2.ds1-22    GNU C Library: Shared libraries an
ii  libfam0c102              2.7.0-7         client library to control the FAM 
ii  libgcc1                  1:3.4.3-13      GCC support library
ii  libice6                  4.3.0.dfsg.1-13 Inter-Client Exchange library
ii  libidn11                 0.5.13-1.0      GNU libidn library, implementation
ii  libjpeg62                6b-10           The Independent JPEG Group's JPEG 
ii  libldap2                 2.1.30-7        OpenLDAP libraries
ii  libpcre3                 5.0-1           Perl 5 Compatible Regular Expressi
ii  libpng12-0               1.2.8rel-1      PNG library - runtime
ii  libqt3c102-mt            3:3.3.4-3       Qt GUI Library (Threaded runtime v
ii  libsm6                   4.3.0.dfsg.1-13 X Window System Session Management
ii  libsmbclient             3.0.14a-1       shared library that allows applica
ii  libstdc++5               1:3.3.6-5       The GNU Standard C++ Library v3
ii  libx11-6                 4.3.0.dfsg.1-13 X Window System protocol client li
ii  libxcursor1              1.1.3-1         X cursor management library
ii  libxext6                 4.3.0.dfsg.1-13 X Window System miscellaneous exte
ii  libxrender1              1:0.8.3-1       X Rendering Extension client libra
hi  xlibs                    4.3.0.dfsg.1-4  X Window System client libraries m
ii  zlib1g                   1:1.2.2-4       compression library - runtime

-- no debconf information

--- bla/kdebase-3.3.2/kioslave/devices/kdedmodule/disklist.cpp	2004-05-22 22:26:51.000000000 +0200
+++ kdebase-3.3.2/kioslave/devices/kdedmodule/disklist.cpp	2005-05-19 13:30:21.000000000 +0200
@@ -74,6 +74,7 @@
 	      && (disk->deviceName() != "tmpfs")
 	      && (disk->mountPoint() != "/dev/swap")
 	      && (disk->mountPoint() != "/dev/pts")
+	      && (disk->deviceName().find("LABEL=") != 0)
 	      && (disk->mountPoint().find("/proc") != 0)
 	      && (disk->deviceName().find("shm") == -1  ))
 		ignore=false;