Author: fehr Date: Wed Sep 7 17:29:12 2011 New Revision: 65594 URL: http://svn.opensuse.org/viewcvs/yast?rev=65594&view=rev Log: ignore btrfs fs when blockid does not see also btrfs (bnc#716058) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc?rev=65594&r1=65593&r2=65594&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc Wed Sep 7 17:29:12 2011 @@ -101,6 +101,16 @@ i!=ub.end(); ++i ) { forbidden = i->type()!=UB_BTRFS; + if( forbidden ) + y2mil( "forbidden:" << v->device() << + " used by non-btrfs:" << v->getUsedBy() ); + } + if( !forbidden ) + { + forbidden = v->getFs()!=BTRFS; + if( forbidden ) + y2mil( "forbidden:" << v->device() << + " non-btrfs:" << v->fsTypeString() ); } if( !ub.empty() ) y2mil( "used_by:" << ub ); 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=65594&r1=65593&r2=65594&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 Sep 7 17:29:12 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Wed Sep 7 16:47:34 CEST 2011 - fehr@suse.de +- ignore btrfs fs when blockid does not see also btrfs (bnc#716058) - call zeroDevice always before formatting to prevent multiple signatures being present (bnc#716058) - use wipefs to remove any existing signatures in zeroDevice -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org