Author: fehr Date: Wed Jun 1 18:38:28 2011 New Revision: 64193 URL: http://svn.opensuse.org/viewcvs/yast?rev=64193&view=rev Log: - support new btrfs_increase_percentage from control.xml - change default subvol list to /opt, /srv, /var/log and /var/spool Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/doc/config.xml.description trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=64193&r1=64192&r2=64193&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jun 1 18:38:28 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 1 18:35:46 CEST 2011 - fehr@suse.de + +- support new btrfs_increase_percentage from control.xml +- change default subvol list to /opt, /srv, /var/log and /var/spool + +------------------------------------------------------------------- Wed Jun 01 13:57:34 CEST 2011 - aschnell@suse.de - install snapper when root is on btrfs Modified: trunk/storage/storage/doc/config.xml.description URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/doc/config.xml.description?rev=64193&r1=64192&r2=64193&view=diff ============================================================================== --- trunk/storage/storage/doc/config.xml.description (original) +++ trunk/storage/storage/doc/config.xml.description Wed Jun 1 18:38:28 2011 @@ -48,3 +48,9 @@ be created. The proposal will not suggest to create a larger filesystem than this limit. This value is only used if proposal_lvm is true. + +btrfs_increase_percentage: + If filesystem for propsal is btrfs size requirements are increased by + this percentage. This is because to the usage of snapshots makes only + sense if there is a certain amount of free space available. + Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=64193&r1=64192&r2=64193&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jun 1 18:38:28 2011 @@ -4250,7 +4250,7 @@ global define map AddSubvolRoot( map part ) { - list<string> def_subvol = [ "tmp", "var/tmp", "var/run" ]; + list<string> def_subvol = [ "opt", "srv", "var/spool", "var/log" ]; part["subvol"] = maplist( string s, def_subvol, { return $[ "create":true, "name":s ]; }); y2milestone( "AddSubvolRoot part:%1", part ); Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=64193&r1=64192&r2=64193&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Wed Jun 1 18:38:28 2011 @@ -170,11 +170,31 @@ btmp = ProductFeatures::GetBooleanFeature("partitioning", "proposal_lvm"); cfg_xml["prop_lvm"] = btmp ? true : false; + itmp = ProductFeatures::GetIntegerFeature("partitioning", "btrfs_increase_percentage"); + cfg_xml["btrfs_increase_percentage"] = itmp; + if (cfg_xml["btrfs_increase_percentage"]:0 == nil || cfg_xml["btrfs_increase_percentage"]:0 < 0) + cfg_xml["btrfs_increase_percentage"] = 100; + SetProposalDefault(false); y2milestone("GetControlCfg cfg_xml:%1", cfg_xml); } + map ret = cfg_xml; + y2milestone("GetControlCfg GetProposalBtrfs:%1", GetProposalBtrfs()); + if( GetProposalBtrfs() ) + { + y2milestone( "GetControlCfg before:%1", ret ); + list<string> keys = [ "home_limit", "root_max", "root_base", "home_max", "vm_want" ]; + foreach( string k, keys, + { + if( haskey( ret, k ) ) + ret[k] = ret[k]:0 + ret[k]:0*100/cfg_xml["btrfs_increase_percentage"]:0; + else + y2warning( "GetControlCfg no key:%1", k ); + }); + y2milestone( "GetControlCfg after :%1", ret ); + } - return cfg_xml; + return ret; } global string GetProposalVM() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org