Author: aschnell Date: Fri Jul 24 10:36:11 2009 New Revision: 58148 URL: http://svn.opensuse.org/viewcvs/yast?rev=58148&view=rev Log: - btrfs supports quota - some refactoring Modified: trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=58148&r1=58147&r2=58148&view=diff ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Fri Jul 24 10:36:11 2009 @@ -885,9 +885,8 @@ { ret = swap_fst_options; } - y2milestone( "fsys %1", fsys ); - y2milestone( "ret %1", ret ); - return( ret ); + y2milestone("fsys:%1 ret:%2", fsys, ret); + return ret; }; @@ -1393,47 +1392,41 @@ tostring(m["freq"]:0), tostring(m["passno"]:0) ] ); } -global define boolean CanDoQuota( map part ) - ``{ - list quota_fs = [ `ext2, `ext3, `ext4, `reiser, `xfs ]; - return( contains( quota_fs, part["used_fs"]:`unknown )); + + global boolean CanDoQuota(map part) + { + const list<symbol> quota_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs ]; + return contains(quota_fs, part["used_fs"]:`unknown); } -global define boolean HasQuota( map part ) - ``{ - boolean ret = false; - list<string> opts = splitstring( part["fstopt"]:"", "," ); - integer i=0; - while( !ret && i<size(opts) ) - { - ret = opts[i]:""=="usrquota" || opts[i]:""=="grpquota" || - search(opts[i]:"","usrjquota=")==0 || - search(opts[i]:"","grpjquota=")==0; - i = i+1; - } - return( ret ); + global boolean HasQuota(map part) + { + list<string> opts = splitstring(part["fstopt"]:"", ","); + return find(string opt, opts, { + return opt == "usrquota" || opt == "grpquota" || search(opt, "usrjquota=") == 0 || + search(opt, "grpjquota=") == 0; + }) != nil; } -global define string RemoveQuotaOpts( string fst_opts ) + global string RemoveQuotaOpts(string fst_opts) { - list<string> opts = splitstring( fst_opts, "," ); - opts = filter( string o, opts, - ``( o!="usrquota" && o!="grpquota" && - search(o,"usrjquota=")!=0 && search(o,"grpjquota=")!=0 && - search(o,"jqfmt=")!=0 )); - return( mergestring( opts, "," )); - } - -global define string AddQuotaOpts( map part, string fst_opts ) - { - string ret = RemoveQuotaOpts( fst_opts ); - list journal = [ `ext3, `ext4, `reiser ]; - if( contains( journal, part["used_fs"]:`unknown )) - ret = ret + ",usrjquota=aquota.user,grpjquota=aquota.group,jqfmt=vfsv0"; - else - ret = ret + ",usrquota,grpquota"; - return( ret ); + list<string> opts = splitstring(fst_opts, ","); + opts = filter(string opt, opts, { + return opt != "usrquota" && opt != "grpquota" && search(opt, "usrjquota=") != 0 && + search(opt, "grpjquota=") != 0 && search(opt, "jqfmt=") != 0; + }); + return mergestring(opts, ","); } + global string AddQuotaOpts(map part, string fst_opts) + { + const list<symbol> journal = [ `ext3, `ext4, `btrfs, `reiser ]; + string ret = RemoveQuotaOpts(fst_opts); + if (contains(journal, part["used_fs"]:`unknown)) + ret = ret + ",usrjquota=aquota.user,grpjquota=aquota.group,jqfmt=vfsv0"; + else + ret = ret + ",usrquota,grpquota"; + return ret; + } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org