Author: aschnell Date: Wed Nov 9 12:40:36 2011 New Revision: 66771 URL: http://svn.opensuse.org/viewcvs/yast?rev=66771&view=rev Log: - fixed NFS detection (bnc#729155) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc?rev=66771&r1=66770&r2=66771&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc Wed Nov 9 12:40:36 2011 @@ -186,9 +186,17 @@ { Nfs *n = NULL; NfsIter nfs; - if( findNfs( i->device, nfs )) + + if( findNfs( Nfs::canonicalName(i->device), nfs )) { n = &(*nfs); + + list<string> tmp = n->altNames(); + if (!contains(tmp, i->device)) + { + tmp.push_back(i->device); + n->setAltNames(tmp); + } } else { @@ -212,7 +220,7 @@ { NfsPair p=nfsPair(); i=p.begin(); - while( i!=p.end() && i->device()!=dev ) + while( i!=p.end() && !i->sameDevice(dev) ) ++i; return( i!=p.end() ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=66771&r1=66770&r2=66771&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Nov 9 12:40:36 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 09 12:29:53 CET 2011 - aschnell@suse.de + +- fixed NFS detection (bnc#729155) + +------------------------------------------------------------------- Mon Nov 7 11:46:45 CET 2011 - fehr@suse.de - version 2.17.121 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org