Author: aschnell Date: Mon Aug 25 15:19:15 2008 New Revision: 50362 URL: http://svn.opensuse.org/viewcvs/yast?rev=50362&view=rev Log: - ignore udev ids starting with "dm-" Modified: trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmmultipathCo.cc?rev=50362&r1=50361&r2=50362&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Mon Aug 25 15:19:15 2008 @@ -87,10 +87,9 @@ { y2mil("disk:" << nm << " id:" << id); udev_id = id; - udev_id.erase( remove_if(udev_id.begin(), udev_id.end(), - find_begin("dm-uuid-mpath"))); + udev_id.erase(remove_if(udev_id.begin(), udev_id.end(), find_begin("dm-")), udev_id.end()); udev_id.sort(); - y2mil( "id:" << udev_id ); + y2mil("id:" << udev_id); DmmultipathPair pp = dmmultipathPair(); for( DmmultipathIter p=pp.begin(); p!=pp.end(); ++p ) Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.cc?rev=50362&r1=50361&r2=50362&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Mon Aug 25 15:19:15 2008 @@ -76,10 +76,9 @@ { y2mil("disk:" << nm << " id:" << id); udev_id = id; - udev_id.erase( remove_if(udev_id.begin(), udev_id.end(), - find_begin("dm-uuid-dmraid"))); + udev_id.erase(remove_if(udev_id.begin(), udev_id.end(), find_begin("dm-")), udev_id.end()); udev_id.sort(); - y2mil( "id:" << udev_id ); + y2mil("id:" << udev_id); DmraidPair pp = dmraidPair(); for( DmraidIter p=pp.begin(); p!=pp.end(); ++p ) Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=50362&r1=50361&r2=50362&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Aug 25 15:19:15 2008 @@ -543,11 +543,9 @@ DmmultipathCo * v = new DmmultipathCo( this, *i, ppart ); if( v->isValid() ) { - /* list<string> nm = by_id["dm-"+decString(v->minorNr())]; if( !nm.empty() ) v->setUdevData( nm ); - */ addToList( v ); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org