Author: ug Date: Mon May 18 16:04:17 2009 New Revision: 57236 URL: http://svn.opensuse.org/viewcvs/yast?rev=57236&view=rev Log: ask libstorage for the default filesystem instead of hardcoded ext3 Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/partition_dialogs.ycp trunk/autoinstallation/src/include/autopart.ycp trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp trunk/autoinstallation/src/modules/AutoinstPartition.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=57236&r1=57235&r2=57236&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon May 18 16:04:17 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 18 16:03:24 CEST 2009 - ug@suse.de + +- ask libstorage for the default filesystem instead of hardcoded + ext3 + +------------------------------------------------------------------- Mon May 18 12:32:29 CEST 2009 - ug@suse.de - ZeroNewPartitions is configureable Modified: trunk/autoinstallation/src/dialogs/partition_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/partition_dialogs.ycp?rev=57236&r1=57235&r2=57236&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/partition_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/partition_dialogs.ycp Mon May 18 16:04:17 2009 @@ -19,6 +19,7 @@ import "Popup"; import "String"; import "AutoinstStorage"; + import "Partitions"; include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_helptexts.ycp"; @@ -101,13 +102,13 @@ this_drive = select (filter (map d, partitioning,``(d["device"]:"" == item)),0,$[]); new_val = $[ "partition_id" : 131, - "filesystem" : `ext3 + "filesystem" : Partitions::DefaultFs() ]; drive = item; } new_val["fsid"] = new_val["partition_id"]:Partitions::fsid_native; - new_val["used_fs"] = new_val["filesystem"]:`ext3; + new_val["used_fs"] = new_val["filesystem"]:Partitions::DefaultFs(); list<string> vgs = []; foreach( map d, partitioning, ``{ Modified: trunk/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/autopart.ycp?rev=57236&r1=57235&r2=57236&view=diff ============================================================================== --- trunk/autoinstallation/src/include/autopart.ycp (original) +++ trunk/autoinstallation/src/include/autopart.ycp Mon May 18 16:04:17 2009 @@ -7,6 +7,7 @@ textdomain "autoinst"; import "FileSystems"; + import "Partitions"; import "Arch"; @@ -424,9 +425,9 @@ } p["mount"] = mount; if (e["reuse"]:false) - p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:`ext3; + p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:Partitions::DefaultFs(); else - p["used_fs"] = solution["partitions",pindex,"filesystem"]:`ext3; + p["used_fs"] = solution["partitions",pindex,"filesystem"]:Partitions::DefaultFs(); value = solution["partitions",pindex,"fstopt"]:""; if( size(value)>0 ) @@ -557,7 +558,7 @@ part["mountby"] = mb; } part["used_fs"] = - solution["partitions",pindex,"filesystem"]:((mount == "swap")?(`swap):(`ext3)); + solution["partitions",pindex,"filesystem"]:((mount == "swap")?(`swap):(Partitions::DefaultFs())); value = solution["partitions",pindex,"fstopt"]:""; if( size(value)>0 ) { Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstLVM.ycp?rev=57236&r1=57235&r2=57236&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Mon May 18 16:04:17 2009 @@ -301,7 +301,7 @@ y2milestone("lv = %1",lv); lv["device"] = "/dev/"+vgname+"/"+lv["lv_name"]:""; - lv["used_fs"] = this_lv["used_fs"]:`ext3; + lv["used_fs"] = this_lv["used_fs"]:Partitions::DefaultFs(); map lvret = $[]; if (lv["resize"]:false ) { @@ -313,7 +313,7 @@ "fstype" : "LV", "nr" : lv["nr"]:"", "mount" : lv["mount"]:"" , - "used_fs" : this_lv["used_fs"]:`ext3, + "used_fs" : this_lv["used_fs"]:Partitions::DefaultFs(), "format" : lv["format"]:false , "device" : lv["device"]:"" ]; @@ -326,7 +326,7 @@ } targetMap = lvret["targets"]:targetMap; } else if ( lv["create"]:true ) { - lv["used_fs"] = lv["filesystem"]:`ext3; + lv["used_fs"] = lv["filesystem"]:Partitions::DefaultFs(); lv["create"] = true; lv["format"] = lv["format"]:true; lv["device"] = "/dev/" + current_vg + "/" + lv["name"]:""; Modified: trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp?rev=57236&r1=57235&r2=57236&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Mon May 18 16:04:17 2009 @@ -449,7 +449,7 @@ // detected_fs! if (haskey(pe,"used_fs") && pe["fsid"]:0 != 253) { - new_pe["filesystem"] = pe["used_fs"]:`ext3; + new_pe["filesystem"] = pe["used_fs"]:Partitions::DefaultFs(); new_pe["format"] = new_pe["format"]:pe["format"]:true; } Modified: trunk/autoinstallation/src/modules/AutoinstPartition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstPartition.ycp?rev=57236&r1=57235&r2=57236&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartition.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartition.ycp Mon May 18 16:04:17 2009 @@ -36,7 +36,7 @@ "uuid" : "", "size" : "10G", "format" : true, - "filesystem" : `ext3, + "filesystem" : Partitions::DefaultFs(), "partition_nr" : 1, "partition_id" : 131, "mountby" : `device, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org