Author: fehr Date: Thu Apr 5 12:49:13 2012 New Revision: 67864 URL: http://svn.opensuse.org/viewcvs/yast?rev=67864&view=rev Log: suppress dm maps for "-real" and "-cow" of LVM snapshots in general Dm container Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc?rev=67864&r1=67863&r2=67864&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc Thu Apr 5 12:49:13 2012 @@ -284,6 +284,23 @@ if (getStorage()->isUsedBy(it->first, UB_DM)) getStorage()->clearUsedBy(it->first); } + if( !skip && (boost::ends_with(table,"-real")|| + boost::ends_with(table,"-cow"))) + { + static Regex delim( "[^-]-[^-]" ); + string on = table; + if( boost::ends_with(on,"-real")) + on.erase( on.size()-5 ); + if( boost::ends_with(tmp,"-cow")) + on.erase( on.size()-4 ); + if( delim.match( on ) ) + { + string devname = "/dev/" + on.substr( 0, delim.so(0)+1 ) + + "/" + on.substr( delim.eo(0)-1 ); + skip = getStorage()->knownDevice( devname ); + y2mil( "devname:" << devname << " skip:" << skip ); + } + } if (!skip && m->sizeK()>0 && !only_crypt ) addDm( m ); else Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes?rev=67864&r1=67863&r2=67864&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Thu Apr 5 12:49:13 2012 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Thu Apr 5 11:59:15 CEST 2012 - fehr@suse.de +- suppress dm maps for "-real" and "-cow" of LVM snapshots in + general Dm container - fix order of LV removals in removeVg when snapshots are present (bnc#755021) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org