Author: fehr Date: Tue Jan 24 13:55:06 2012 New Revision: 67257 URL: http://svn.opensuse.org/viewcvs/yast?rev=67257&view=rev Log: ensure default mountby uuid for btrfs in all cases Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp 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=67257&r1=67256&r2=67257&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 Tue Jan 24 13:55:06 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Tue Jan 24 13:28:45 CET 2012 - fehr@suse.de +- ensure default mountby uuid for btrfs in all cases - prevent display of outdated data with simple btrfs volumes - complete renaming of devs in Btrfs class (bnc#742491) - fix bug in btrfs uuid handling introduced in 2.17.124 (bnc#742491) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp?rev=67257&r1=67256&r2=67257&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Tue Jan 24 13:55:06 2012 @@ -2558,6 +2558,8 @@ return( ret ); } +global symbol GetMountBy( string device ); + global boolean ChangeVolumeProperties( map part ) { integer ret = 0; @@ -2610,8 +2612,9 @@ else y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); } + symbol defmb = GetMountBy( dev ); if( ret==0 && size(part["mount"]:"")>0 && - part["mountby"]:`id != curr["mountby"]:`id ) + part["mountby"]:defmb != curr["mountby"]:defmb ) { changed = true; tmp = fromSymbol(conv_mountby,part["mountby"]:`device); @@ -3267,8 +3270,6 @@ } -global symbol GetMountBy( string device ); - /** * Set the flag if a disk needs to be initialized * @param string the disk to be changed @@ -3312,11 +3313,16 @@ boolean ret = true; if( IsPartType(ctype) ) { + symbol mby = GetMountBy( p["device"]:"" ); + if( p["used_fs"]:`unknown == `btrfs ) + mby = `uuid; ret = Storage::CreatePartition( d["device"]:"", p["device"]:"", p["type"]:`primary, p["fsid"]:Partitions::fsid_native, p["region",0]:0, p["region",1]:0, - p["mountby"]:GetMountBy( p["device"]:"" ) ); + p["mountby"]:mby ); + if( !haskey( p, "mountby" ) && mby!=`device ) + p["mountby"] = mby; } else if( ctype == `CT_MD ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org