summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media/mediamanager/fstabbackend.cpp
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2019-04-06 16:49:26 +0900
committerSlávek Banko <slavek.banko@axis.cz>2019-08-18 15:36:50 +0200
commit4741832142e091d641fb8a90607b4595accb905d (patch)
tree31f31b6389635adc523c7a33f873a9562e1adadb /tdeioslave/media/mediamanager/fstabbackend.cpp
parent0aaebc24cd00c9dd833c16dd14d1814948baac38 (diff)
downloadtdebase-4741832142e091d641fb8a90607b4595accb905d.tar.gz
tdebase-4741832142e091d641fb8a90607b4595accb905d.zip
Revive NetBSD support
Catch up to TDE and OS changes Signed-off-by: OBATA Akio <obache@wizdas.com> (cherry picked from commit 2a88ec3c02ab46c8b816cfa348ea53075f57a59c)
Diffstat (limited to 'tdeioslave/media/mediamanager/fstabbackend.cpp')
-rw-r--r--tdeioslave/media/mediamanager/fstabbackend.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 84910352d..fb891254c 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -69,7 +69,7 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
KDirWatch::self()->startScan();
-#ifdef Q_OS_FREEBSD
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
connect( &m_mtabTimer, TQT_SIGNAL( timeout() ),
this, TQT_SLOT( handleMtabChange() ) );
m_mtabTimer.start(250);
@@ -170,7 +170,7 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly)
void FstabBackend::handleMtabChange(bool allowNotification)
{
TQStringList new_mtabIds;
- KMountPoint::List mtab = KMountPoint::currentMountPoints();
+ KMountPoint::List mtab = KMountPoint::currentMountPoints(KMountPoint::NeedRealDeviceName);
KMountPoint::List::iterator it = mtab.begin();
KMountPoint::List::iterator end = mtab.end();
@@ -409,6 +409,8 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint,
|| devNode.find("/dev/scd")!=-1 || devNode.find("/dev/sr")!=-1
// FREEBSD SPECIFIC
|| devNode.find("/acd")!=-1 || devNode.find("/scd")!=-1
+ // NETBSD SPECIFIC
+ || devNode.find("/cd")!=-1 || devNode.find("/cd")!=-1
)
{
mimeType = "media/cdrom";