Author: fehr Date: Wed Nov 9 12:53:02 2011 New Revision: 66772 URL: http://svn.opensuse.org/viewcvs/yast?rev=66772&view=rev Log: avoid detection on volumes on disk used by other stuff (bnc#729155) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/EtcFstab.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/EtcFstab.cc?rev=66772&r1=66771&r2=66772&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/EtcFstab.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/EtcFstab.cc Wed Nov 9 12:53:02 2011 @@ -323,7 +323,11 @@ while( i!=co.end() && i->old.dentry != entry.dentry ) ++i; if( i!=co.end() ) + { + y2mil( "entry old:" << i->nnew ); i->nnew.device = i->old.device = device; + y2mil( "entry new:" << i->nnew ); + } } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc?rev=66772&r1=66771&r2=66772&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Wed Nov 9 12:53:02 2011 @@ -860,7 +860,8 @@ SystemCmd Losetup(LOSETUPBIN " -a"); for( VolIterator i=begin; i!=end; ++i ) { - if (!i->isUsedBy()) + if( !i->isUsedBy() && + (i->getContainer()==NULL||!i->getContainer()->isUsedBy())) { i->getLoopData( Losetup ); i->getFsData(systeminfo.getBlkid()); @@ -869,7 +870,8 @@ } for( VolIterator i=begin; i!=end; ++i ) { - if (!i->isUsedBy()) + if( !i->isUsedBy() && + (i->getContainer()==NULL||!i->getContainer()->isUsedBy())) { i->getMountData(systeminfo.getProcMounts(), !detectMounted); i->getFstabData( *fstab ); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc?rev=66772&r1=66771&r2=66772&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Wed Nov 9 12:53:02 2011 @@ -372,12 +372,14 @@ if( !found && !(uuid.empty()&&label.empty()) ) { found = fstabData.findUuidLabel( uuid, label, entry ); - fstabData.setDevice( entry, device() ); + if(found) + fstabData.setDevice( entry, device() ); } if( !found && !(udevId().empty()&&udevPath().empty()) ) { found = fstabData.findIdPath( udevId(), udevPath(), entry ); - fstabData.setDevice( entry, device() ); + if(found) + fstabData.setDevice( entry, device() ); } } 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=66772&r1=66771&r2=66772&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:53:02 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Wed Nov 09 12:29:53 CET 2011 - aschnell@suse.de +- avoid detection on volumes on disk used by other stuff (bnc#729155) - fixed NFS detection (bnc#729155) ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org