[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kdf
From:       Adriaan de Groot <adridg () cs ! kun ! nl>
Date:       2004-01-01 19:20:49
Message-ID: 20040101192049.D4F099081 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

FreeBSD's mount(8) is picky.
CCMAIL: 67547-done@bugs.kde.org


  M +10 -0     disks.cpp   1.27


--- kdeutils/kdf/disks.cpp  #1.26:1.27
@@ -97,7 +97,17 @@ int DiskEntry::mount()
   if (cmdS.isEmpty()) // generate default mount cmd
     if (getuid()!=0 ) // user mountable
+      {
       cmdS="mount %d";
+      }
         else  // root mounts with all params/options
+      {
+#ifdef Q_OS_FREEBSD
+      // FreeBSD's mount(8) is picky: -o _must_ go before
+      // the device and mountpoint.
+      cmdS=QString::fromLatin1("mount -t%t -o%o %d %m");
+#else
       cmdS="mount -t%t %d %m -o %o";
+#endif
+      }
 
   cmdS.replace(QRegExp("%d"),this->deviceName());


[prev in list] [next in list] [prev in thread] [next in thread]