Author: ug Date: Thu Sep 4 14:32:05 2008 New Revision: 50664 URL: http://svn.opensuse.org/viewcvs/yast?rev=50664&view=rev Log: moved code from AutoinstClone to appropriate modules Modified: trunk/autoinstallation/src/clients/software_auto.ycp trunk/autoinstallation/src/clients/storage_auto.ycp trunk/autoinstallation/src/include/conftree.ycp trunk/autoinstallation/src/modules/AutoinstClone.ycp trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Modified: trunk/autoinstallation/src/clients/software_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/software_auto.ycp?rev=50664&r1=50663&r2=50664&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/software_auto.ycp (original) +++ trunk/autoinstallation/src/clients/software_auto.ycp Thu Sep 4 14:32:05 2008 @@ -136,6 +136,9 @@ else if (func == "Import") { ret = AutoinstSoftware::Import(param); } + else if (func == "Read") { + ret = AutoinstSoftware::Read(); + } else if (func == "Reset") { AutoinstSoftware::Import($[]); ret = $[]; Modified: trunk/autoinstallation/src/clients/storage_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/storage_auto.ycp?rev=50664&r1=50663&r2=50664&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/storage_auto.ycp (original) +++ trunk/autoinstallation/src/clients/storage_auto.ycp Thu Sep 4 14:32:05 2008 @@ -53,6 +53,9 @@ } y2milestone("Import: %1",list<map> param ); } +else if(func == "Read") { + ret = AutoinstPartPlan::Read(); +} /* Create a summary*/ else if(func == "Summary") { ret = AutoinstPartPlan::Summary(); Modified: trunk/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/conftree.ycp?rev=50664&r1=50663&r2=50664&view=diff ============================================================================== --- trunk/autoinstallation/src/include/conftree.ycp (original) +++ trunk/autoinstallation/src/include/conftree.ycp Thu Sep 4 14:32:05 2008 @@ -266,18 +266,8 @@ boolean readModule(string module_name){ map resourceMap = Y2ModuleConfig::ModuleMap[module_name]:$[]; string auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:""; - if( module_name == "software" ){ - Call::Function("software_auto" , ["Import", AutoinstClone::Software()]); - Call::Function("software_auto" , ["SetModified"]); - } - else if( module_name == "partitioning" ){ - Call::Function("storage_auto" , ["Import", AutoinstClone::Partitioning()]); - Call::Function("storage_auto" , ["SetModified"]); - } - else{ - Call::Function(auto , ["Read"]); - Call::Function(auto , ["SetModified"]); - } + Call::Function(auto , ["Read"]); + Call::Function(auto , ["SetModified"]); Profile::prepare = true; return true; } Modified: trunk/autoinstallation/src/modules/AutoinstClone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstClone.ycp?rev=50664&r1=50663&r2=50664&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstClone.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstClone.ycp Thu Sep 4 14:32:05 2008 @@ -26,16 +26,11 @@ import "Misc"; import "Storage"; import "AutoinstConfig"; - import "StorageDevices"; - import "Storage"; - import "Partitions"; import "Report"; include "autoinstall/xml.ycp"; global map Profile = $[]; - global list<string> inst = []; - global map fulfilled_cache = $[]; integer bytes_per_unit = 0; @@ -113,310 +108,6 @@ */ - /** - * Create a partition plan for the calling client - * @return list partition plan - */ - global define list Partitioning() - { - Mode::SetMode("normal"); - StorageDevices::InitDone(); - map StorageMap = eval(Storage::GetTargetMap()); - - StorageMap=filter(string d, map p, StorageMap, ``( d != "/dev/evms" && size(p["partitions"]:[]) > 0)); - y2milestone("Storagemap %1", StorageMap); -// list evms_vgs = []; - - list drives = maplist(string k, map v, StorageMap, ``{ - list partitions = []; - list winp = []; - list no_format_list = [ 65, 6, 222 ]; - list no_create_list = [ 222 ]; - list<integer> usepartitions = []; - integer cyl_size = v["cyl_size"]:0; - boolean no_create = false; - foreach(map pe, v["partitions"]:[], ``{ - if( pe["type"]:`x == `extended ) - continue; - map new_pe = $[]; - new_pe["create"] = true; - boolean skipwin = false; - if (haskey(pe,"enc_type")) { - new_pe["enc_type"] = pe["enc_type"]:`twofish; - new_pe["crypt_key"] = "ENTER KEY HERE"; - new_pe["loop_fs"] = true; - new_pe["crypt_fs"] = true; - } - if (haskey(pe,"fsid")) - { - integer fsid = pe["fsid"]:131; - list wintypes = union(Partitions::fsid_wintypes, Partitions::fsid_dostypes); - list allwin = union(wintypes, Partitions::fsid_ntfstypes); - if (contains(allwin, fsid) && (!issubstring(pe["mount"]:"", "/boot") && !pe["boot"]:false) ) -// if (contains(allwin, fsid) && ! issubstring(pe["mount"]:"", "/boot") ) - { - y2debug("Windows partitions found: %1", fsid ); - winp = add(winp, pe["nr"]:0); - skipwin = true; - if( size(partitions) > 0 ) { - no_create = true; - } - } - if( contains(allwin, fsid) && issubstring(pe["mount"]:"", "/boot") ) { - new_pe["partition_id"] = 259; - } else { - new_pe["partition_id"] = pe["fsid"]:131; - } - if( contains( no_format_list, pe["fsid"]:0 ) ) - new_pe["format"] = false; - if( contains( no_create_list, pe["fsid"]:0 ) ) - new_pe["create"] = false; - } - if( haskey(pe,"type") && pe["type"]:`x == `primary ) { - new_pe["partition_type"] = "primary"; // can we always copy that element? - } - if (haskey(pe,"region") && new_pe["create"]:true == true ) - { - // don't clone the exact region. - // I don't see any benefit in cloning that strict. - //new_pe["region"] = pe["region"]:[]; -// new_pe["size"] = sformat("%1", pe["size_k"]:0*1024); - new_pe["size"] = sformat("%1", pe["size_k"]:0*1024-cyl_size); // one cylinder buffer for #262535 - if( new_pe["size"]:0 < cyl_size ) // bnc#415005 - new_pe["size"] = cyl_size; - } - if (haskey(pe,"label")) { - new_pe["label"] = pe["label"]:""; - } - if (haskey(pe,"mountby")) { - new_pe["mountby"] = pe["mountby"]:`nomb; - } - // LVM Group - if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_LVM) - { - new_pe["lvm_group"] = pe["used_by"]:""; - } - - // LV - if (pe["type"]:`unknown == `lvm ) - { - new_pe["lv_name"] = pe["name"]:""; - new_pe["size"] = sformat("%1", pe["size_k"]:0*1024); - } - if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_MD) - { - new_pe["raid_name"] = "/dev/"+pe["used_by"]:""; - } - - // Used Filesystem - // Raid devices get the filesystem lying on them as - // detected_fs! - if (haskey(pe,"used_fs") && pe["fsid"]:0 != 253) - { - new_pe["filesystem"] = pe["used_fs"]:`reiser; - new_pe["format"] = new_pe["format"]:pe["format"]:true; - } - - if (haskey(pe,"nr") && pe["type"]:`unknown != `lvm) - { - if (!skipwin) - { - y2debug("Adding partition to be used: %1", pe["nr"]:0); - usepartitions = add(usepartitions, pe["nr"]:0); - } - new_pe["partition_nr"] = pe["nr"]:0; - } - if (pe["mount"]:"" != "") - { - new_pe["mount"] = pe["mount"]:""; - } - if (k == "/dev/md") - { - map raid_options = $[]; - raid_options["persistent_superblock"] = - pe["persistent_superblock"]:false; - raid_options["raid_type"] = pe["raid_type"]:"raid0"; - new_pe["raid_options"] = raid_options; - } - - if (!skipwin && new_pe["partition_id"]:0 != 15 ) { - partitions=add(partitions,new_pe); - } - }); - - - // don't create partitions that are between windows partitions - // they must exist - map drive = $[]; - if( no_create ) { - partitions = maplist( map m, (list<map>)partitions, { - m["create"] = false; - return m; - }); - } - drive["partitions"] = partitions; - drive["device"] = k; - if( v["type"]:`CT_UNKNOWN==`CT_LVM) - { - drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); - drive["type"] = `CT_LVM; - } - if (haskey(v,"lvm2") && v["lvm2"]:false) - { - drive["lvm2"] = true; - } - - if (size(partitions) > 0 ) - { - if (size(winp) == 0 ) - { - drive["use"] = "all"; - } - else - { - list<string> up = []; - foreach(integer i, usepartitions, ``{ - up = add (up, sformat("%1", i)); - }); - drive["use"] = mergestring(up, ","); - } - } - return drive; - }); -// drives = filter( map v, (list<map>)drives, ``{ -// if( ! (contains( evms_vgs, v["device"]:"") && v["type"]:`x == `CT_LVM ) ) -// return true; -// y2milestone("kicking LVM %1 out of the profile because an EVMS with that name exists",v); -// return false; -// }); - /* remove drives with no mountpoint */ - drives = filter( map v, (list<map>)drives, ``{ - boolean keep = false; - foreach( map p, (list<map>)v["partitions"]:[], ``{ - if( p["mount"]:"" != "" || haskey(p,"lvm_group") || haskey(p,"raid_name") ) { - keep = true; - break; - } - }); - return keep; - }); - - Mode::SetMode("autoinst_config"); - return drives; - } - - global define boolean isPatternFulfilled( string p ) { - boolean ret = true; - if( haskey( fulfilled_cache, p ) ) - return fulfilled_cache[p]:false; - list > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); - - foreach( map dep, all_xpatterns, ``{ - if( ret == true && dep["name"]:"" == p ) { - foreach( map dep2, dep["dependencies"]:[], ``{ - if( dep2["dep_kind"]:"" == "requires" ) { - if( dep2["res_kind"]:"" == "package" && !contains( inst, dep2["name"]:"" ) ) { - ret = false; - break; - } else if( dep2["res_kind"]:"" == "pattern" && !isPatternFulfilled( dep2["name"]:"" ) ) { - ret = false; - break; - } - } - }); - } - }); - fulfilled_cache[p] = ret; - return ret; - } - - global define list<string> getPatterns() { - list<string> ret = []; - list > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); - - foreach( map m, all_patterns, ``{ - if( !contains(ret, m["name"]:"") && isPatternFulfilled( m["name"]:"" ) ) - ret = add( ret, m["name"]:"" ); - }); - return ret; - } - - /** - * Return list of software packages of calling client - * @return map map of installed software package - * "patterns" -> list<string> addon selections - * "packages" -> list<string> user selected packages - * "remove-packages" -> list<string> packages to remove - */ - global define map Software() - { -// boolean ret = Pkg::TargetInit("/", false); - Pkg::TargetInitialize ("/"); - Pkg::TargetLoad(); - Pkg::SourceStartManager (true); - - inst = Pkg::GetPackages(`installed, true); - list > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); - list > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); - list<string> patterns = []; - - // get all fulfilled patterns - // way too many will be fulfilled - // we will clean that up later - patterns = getPatterns(); - - Pkg::TargetFinish (); - - string tmproot = AutoinstConfig::tmpDir; - SCR::Execute(.target.mkdir, tmproot + "/rootclone"); - Pkg::TargetInit( tmproot + "/rootclone", true); - y2debug("SourceStartCache: %1", Pkg::SourceStartCache(false)); - - Pkg::SourceStartManager(true); - - list<string> packages = Pkg::FilterPackages(false, false, true, true); - Pkg::TargetFinish (); - // Remove kernel packages - list<string> userpackages = packages; - list<string> removepackages = []; - - list<string> patternPackages = []; - list<string> new_p = []; - foreach( string tmp_pattern, patterns, ``{ - list > xpattern = filter( map p, all_xpatterns, ``( p["name"]:"" == tmp_pattern ) ); - map found = xpattern[0]:$[]; - boolean req = false; - foreach( map d, found["dependencies"]:[], ``{ - if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) { - patternPackages = add(patternPackages, d["name"]:""); - req = true; - } - }); - // workaround for our pattern design - if( req == true ) - new_p = add( new_p, tmp_pattern ); - }); - patterns = new_p; - - - map software = $[]; - if( size(patterns) > 0 ) { - foreach(string p, inst, ``{ - if (!contains(patternPackages, p)) - userpackages = add( userpackages, p ); - }); - foreach(string p, patternPackages, ``{ - if (!contains(inst,p)) - removepackages = add( removepackages, p ); - }); - } - - software["packages"] = sort( filter(string pkg, userpackages, ``(! regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) ); - software["patterns"] = sort( patterns ); - software["remove-packages"] = sort( removepackages ); - return software; - } - /** * General options @@ -567,24 +258,13 @@ if (resource == "") resource = def_resource; y2debug("current resource: %1", resource); - if (contains(additional, resource) && - "partitioning" != resource && /* handled below */ - "software" != resource) /* handled below */ + if (contains(additional, resource) ) { boolean ret = CommonClone(def_resource, resourceMap); } }); - if( contains(additional, "partitioning")){ - Call::Function("storage_auto" , ["Import", Partitioning()]); - Call::Function("storage_auto" , ["SetModified"]); - } - - if( contains(additional, "software")){ - Call::Function("software_auto" , ["Import", Software()]); - Call::Function("software_auto" , ["SetModified"]); - } Call::Function("general_auto" , ["Import", General()]); Call::Function("general_auto" , ["SetModified"]); Modified: trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp?rev=50664&r1=50663&r2=50664&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Thu Sep 4 14:32:05 2008 @@ -19,6 +19,10 @@ import "AutoinstPartition"; import "Summary"; import "Popup"; + import "Mode"; + import "StorageDevices"; + import "Storage"; + import "Partitions"; /** @@ -343,6 +347,200 @@ } } + + /** + * Create a partition plan for the calling client + * @return list partition plan + */ + define list ReadHelper() + { + Mode::SetMode("normal"); + StorageDevices::InitDone(); + map StorageMap = eval(Storage::GetTargetMap()); + + StorageMap=filter(string d, map p, StorageMap, ``( d != "/dev/evms" && size(p["partitions"]:[]) > 0)); + y2milestone("Storagemap %1", StorageMap); +// list evms_vgs = []; + + list drives = maplist(string k, map v, StorageMap, ``{ + list partitions = []; + list winp = []; + list no_format_list = [ 65, 6, 222 ]; + list no_create_list = [ 222 ]; + list<integer> usepartitions = []; + integer cyl_size = v["cyl_size"]:0; + boolean no_create = false; + foreach(map pe, v["partitions"]:[], ``{ + if( pe["type"]:`x == `extended ) + continue; + map new_pe = $[]; + new_pe["create"] = true; + boolean skipwin = false; + if (haskey(pe,"enc_type")) { + new_pe["enc_type"] = pe["enc_type"]:`twofish; + new_pe["crypt_key"] = "ENTER KEY HERE"; + new_pe["loop_fs"] = true; + new_pe["crypt_fs"] = true; + } + if (haskey(pe,"fsid")) + { + integer fsid = pe["fsid"]:131; + list wintypes = union(Partitions::fsid_wintypes, Partitions::fsid_dostypes); + list allwin = union(wintypes, Partitions::fsid_ntfstypes); + if (contains(allwin, fsid) && (!issubstring(pe["mount"]:"", "/boot") && !pe["boot"]:false) ) +// if (contains(allwin, fsid) && ! issubstring(pe["mount"]:"", "/boot") ) + { + y2debug("Windows partitions found: %1", fsid ); + winp = add(winp, pe["nr"]:0); + skipwin = true; + if( size(partitions) > 0 ) { + no_create = true; + } + } + if( contains(allwin, fsid) && issubstring(pe["mount"]:"", "/boot") ) { + new_pe["partition_id"] = 259; + } else { + new_pe["partition_id"] = pe["fsid"]:131; + } + if( contains( no_format_list, pe["fsid"]:0 ) ) + new_pe["format"] = false; + if( contains( no_create_list, pe["fsid"]:0 ) ) + new_pe["create"] = false; + } + if( haskey(pe,"type") && pe["type"]:`x == `primary ) { + new_pe["partition_type"] = "primary"; // can we always copy that element? + } + if (haskey(pe,"region") && new_pe["create"]:true == true ) + { + // don't clone the exact region. + // I don't see any benefit in cloning that strict. + //new_pe["region"] = pe["region"]:[]; +// new_pe["size"] = sformat("%1", pe["size_k"]:0*1024); + new_pe["size"] = sformat("%1", pe["size_k"]:0*1024-cyl_size); // one cylinder buffer for #262535 + if( new_pe["size"]:0 < cyl_size ) // bnc#415005 + new_pe["size"] = cyl_size; + } + if (haskey(pe,"label")) { + new_pe["label"] = pe["label"]:""; + } + if (haskey(pe,"mountby")) { + new_pe["mountby"] = pe["mountby"]:`nomb; + } + // LVM Group + if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_LVM) + { + new_pe["lvm_group"] = pe["used_by"]:""; + } + + // LV + if (pe["type"]:`unknown == `lvm ) + { + new_pe["lv_name"] = pe["name"]:""; + new_pe["size"] = sformat("%1", pe["size_k"]:0*1024); + } + if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_MD) + { + new_pe["raid_name"] = "/dev/"+pe["used_by"]:""; + } + + // Used Filesystem + // Raid devices get the filesystem lying on them as + // detected_fs! + if (haskey(pe,"used_fs") && pe["fsid"]:0 != 253) + { + new_pe["filesystem"] = pe["used_fs"]:`reiser; + new_pe["format"] = new_pe["format"]:pe["format"]:true; + } + + if (haskey(pe,"nr") && pe["type"]:`unknown != `lvm) + { + if (!skipwin) + { + y2debug("Adding partition to be used: %1", pe["nr"]:0); + usepartitions = add(usepartitions, pe["nr"]:0); + } + new_pe["partition_nr"] = pe["nr"]:0; + } + if (pe["mount"]:"" != "") + { + new_pe["mount"] = pe["mount"]:""; + } + if (k == "/dev/md") + { + map raid_options = $[]; + raid_options["persistent_superblock"] = + pe["persistent_superblock"]:false; + raid_options["raid_type"] = pe["raid_type"]:"raid0"; + new_pe["raid_options"] = raid_options; + } + + if (!skipwin && new_pe["partition_id"]:0 != 15 ) { + partitions=add(partitions,new_pe); + } + }); + + + // don't create partitions that are between windows partitions + // they must exist + map drive = $[]; + if( no_create ) { + partitions = maplist( map m, (list<map>)partitions, { + m["create"] = false; + return m; + }); + } + drive["partitions"] = partitions; + drive["device"] = k; + if( v["type"]:`CT_UNKNOWN==`CT_LVM) + { + drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); + drive["type"] = `CT_LVM; + } + if (haskey(v,"lvm2") && v["lvm2"]:false) + { + drive["lvm2"] = true; + } + + if (size(partitions) > 0 ) + { + if (size(winp) == 0 ) + { + drive["use"] = "all"; + } + else + { + list<string> up = []; + foreach(integer i, usepartitions, ``{ + up = add (up, sformat("%1", i)); + }); + drive["use"] = mergestring(up, ","); + } + } + return drive; + }); +// drives = filter( map v, (list<map>)drives, ``{ +// if( ! (contains( evms_vgs, v["device"]:"") && v["type"]:`x == `CT_LVM ) ) +// return true; +// y2milestone("kicking LVM %1 out of the profile because an EVMS with that name exists",v); +// return false; +// }); + /* remove drives with no mountpoint */ + drives = filter( map v, (list<map>)drives, ``{ + boolean keep = false; + foreach( map p, (list<map>)v["partitions"]:[], ``{ + if( p["mount"]:"" != "" || haskey(p,"lvm_group") || haskey(p,"raid_name") ) { + keep = true; + break; + } + }); + return keep; + }); + + Mode::SetMode("autoinst_config"); + return drives; + } + + /** * PUBLIC INTERFACE */ @@ -400,6 +598,10 @@ return true; } + global define boolean Read(){ + return Import( (list<map>) ReadHelper()); + } + /** * Dump the settings to a map, for autoinstallation use. * @return list Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=50664&r1=50663&r2=50664&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Thu Sep 4 14:32:05 2008 @@ -16,6 +16,7 @@ import "Stage"; import "SpaceCalculation"; import "Packages"; + import "Popup"; import "Report"; import "Kernel"; import "AutoinstConfig"; @@ -49,6 +50,9 @@ /* default value of settings modified */ global boolean modified = false; + global list<string> inst = []; + global map fulfilled_cache = $[]; + /** * Function sets internal variable, which indicates, that any * settings were modified, to "true" @@ -259,6 +263,71 @@ } } + if (haskey(Profile::current, "inetd")) { + map conf = Profile::current["inetd"]:$[]; + if (conf["netd_service"]:`none == `xinetd ) + allpackages = (list<string>) union(allpackages, + ["xinetd"]); + else + allpackages = (list<string>) union(allpackages, + ["inetd"]); + + } + + if (haskey(Profile::current, "nis")) { + map conf = Profile::current["nis"]:$[]; + if (conf["start_nis"]:false) + allpackages = (list<string>) union(allpackages, ["yast2-nis-client","ypbind"]); + + if (conf["start_autofs"]:false) + { + string pkg = "autofs4"; + allpackages = add (allpackages, pkg); + } + } + + if (haskey(Profile::current, "security")) { + allpackages = (list<string>) union(allpackages, + ["yast2-security"]); + } + + if (haskey(Profile::current, "ldap")) { + map ldapclient = Profile::current["ldap"]:$[]; + if (ldapclient["start_ldap"]:false) + allpackages = (list<string>) union(allpackages, ["pam_ldap","nss_ldap"]); + if (ldapclient["start_autofs"]:false) + { + string pkg = "autofs4"; + allpackages = add (allpackages, pkg); + } + } + + if (haskey(Profile::current, "nfs_server")) + { + boolean start_nfsserver = Profile::current["nfs_server", "start_nfsserver"]:false; + if (start_nfsserver) + allpackages = (list<string>) union(allpackages, ["yast2-nfs-server", "nfs-kernel-server"]); + } + + + if (haskey(Profile::current, "mail")) { + map mail = Profile::current["mail"]:$[]; + if (mail["mta"]:`other == `postfix) + { + allpackages = add(allpackages, "postfix"); + PackageAI::toremove = add(PackageAI::toremove, "sendmail"); + if (mail["use_amavis"]:false) + allpackages = add(allpackages, "amavis-postfix"); + } + else if (mail["mta"]:`other == `sendmail) + { + allpackages = add(allpackages, "sendmail"); + PackageAI::toremove = add(PackageAI::toremove, "postfix"); + + if (mail["use_amavis"]:false) + allpackages = add(allpackages, "amavis-sendmail"); + } + } return allpackages; } @@ -382,6 +451,123 @@ AutoinstData::post_packages = (list<string>)toset(union(calcpost,AutoinstData::post_packages)); return; } + + global define boolean isPatternFulfilled( string p ) { + boolean ret = true; + if( haskey( fulfilled_cache, p ) ) + return fulfilled_cache[p]:false; + list > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); + + foreach( map dep, all_xpatterns, ``{ + if( ret == true && dep["name"]:"" == p ) { + foreach( map dep2, dep["dependencies"]:[], ``{ + if( dep2["dep_kind"]:"" == "requires" ) { + if( dep2["res_kind"]:"" == "package" && !contains( inst, dep2["name"]:"" ) ) { + ret = false; + break; + } else if( dep2["res_kind"]:"" == "pattern" && !isPatternFulfilled( dep2["name"]:"" ) ) { + ret = false; + break; + } + } + }); + } + }); + fulfilled_cache[p] = ret; + return ret; + } + + global define list<string> getPatterns() { + list<string> ret = []; + list > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); + + foreach( map m, all_patterns, ``{ + if( !contains(ret, m["name"]:"") && isPatternFulfilled( m["name"]:"" ) ) + ret = add( ret, m["name"]:"" ); + }); + return ret; + } + + + /** + * Return list of software packages of calling client + * @return map map of installed software package + * "patterns" -> list<string> addon selections + * "packages" -> list<string> user selected packages + * "remove-packages" -> list<string> packages to remove + */ + global define map ReadHelper() + { +// boolean ret = Pkg::TargetInit("/", false); + Pkg::TargetInitialize ("/"); + Pkg::TargetLoad(); + Pkg::SourceStartManager (true); + + inst = Pkg::GetPackages(`installed, true); + list > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); + list > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); + list<string> patterns = []; + + // get all fulfilled patterns + // way too many will be fulfilled + // we will clean that up later + patterns = getPatterns(); + + Pkg::TargetFinish (); + + string tmproot = AutoinstConfig::tmpDir; + SCR::Execute(.target.mkdir, tmproot + "/rootclone"); + Pkg::TargetInit( tmproot + "/rootclone", true); + y2debug("SourceStartCache: %1", Pkg::SourceStartCache(false)); + + Pkg::SourceStartManager(true); + + list<string> packages = Pkg::FilterPackages(false, false, true, true); + Pkg::TargetFinish (); + // Remove kernel packages + list<string> userpackages = packages; + list<string> removepackages = []; + + list<string> patternPackages = []; + list<string> new_p = []; + foreach( string tmp_pattern, patterns, ``{ + list > xpattern = filter( map p, all_xpatterns, ``( p["name"]:"" == tmp_pattern ) ); + map found = xpattern[0]:$[]; + boolean req = false; + foreach( map d, found["dependencies"]:[], ``{ + if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) { + patternPackages = add(patternPackages, d["name"]:""); + req = true; + } + }); + // workaround for our pattern design + if( req == true ) + new_p = add( new_p, tmp_pattern ); + }); + patterns = new_p; + + + map software = $[]; + if( size(patterns) > 0 ) { + foreach(string p, inst, ``{ + if (!contains(patternPackages, p)) + userpackages = add( userpackages, p ); + }); + foreach(string p, patternPackages, ``{ + if (!contains(inst,p)) + removepackages = add( removepackages, p ); + }); + } + + software["packages"] = sort( filter(string pkg, userpackages, ``(! regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) ); + software["patterns"] = sort( patterns ); + software["remove-packages"] = sort( removepackages ); + return software; + } + + global define boolean Read(){ + return Import( ReadHelper() ); + } //EOF } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org