- Changed to pass cifs to mount command regardless

  if user provided smb:// or cifs:// URL.

diff --git a/zypp/media/MediaSMB.cc b/zypp/media/MediaSMB.cc
index 6e9eb57..6810cc0 100644 (file)
--- a/zypp/media/MediaSMB.cc
+++ b/zypp/media/MediaSMB.cc
@@ -97,7 +97,7 @@ namespace zypp {
         : MediaHandler( url_r, attach_point_hint_r,
                    stripShare( url_r.getPathName() ), // urlpath WITHOUT share name at attachpoint
                    false )       // does_download
-        , _vfstype( "smbfs" )
+        , _vfstype( "cifs" )
     {
        MIL << "MediaSMB::MediaSMB(" << url_r << ", " << attach_point_hint_r << ")" << endl;
     }
@@ -111,9 +111,9 @@ namespace zypp {
     // DESCRIPTION : Asserted that not already attached, and attachPoint
     //      is a directory.
     //
-    //      NOTE: The implementation currently serves both, "smbfs"
-    //      and "cifs". The only difference is the vfstype passed to
-    //      the mount command.
+    //      NOTE: The implementation currently serves both, "smb" and
+    //      and "cifs" URL's, but passes "cifs" to the mount command
+    //      in any case.
     //
     void MediaSMB::attachTo(bool next)
     {

diff --git a/zypp/media/MediaSMB.h b/zypp/media/MediaSMB.h
index 7a5e2fe..5a65d33 100644 (file)
--- a/zypp/media/MediaSMB.h
+++ b/zypp/media/MediaSMB.h
@@ -23,9 +23,9 @@ namespace zypp {
     /**
      * @short Implementation class for SMB MediaHandler
      *
-     * NOTE: The implementation currently serves both, "smbfs"
-     * and "cifs". The only difference is the vfstype passed to
-     * the mount command.
+     * NOTE: The implementation currently serves both, "smb"
+     * and "cifs" URL's, but passes "cifs" to the mount command
+     * in any case.
      * @see MediaHandler
      **/
     class MediaSMB : public MediaHandler {
@@ -35,6 +35,7 @@ namespace zypp {
       /**
        * vfstype for mount. This is either "smbfs"
        * or "cifs" (rewritten by MediaCIFS).
+       * Obsolete: vfstype is allways "cifs".
        **/
       const char* _vfstype;