Author: ug Date: Tue Aug 26 15:51:58 2008 New Revision: 50382 URL: http://svn.opensuse.org/viewcvs/yast?rev=50382&view=rev Log: package automagic removed Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=50382&r1=50381&r2=50382&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Aug 26 15:51:58 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Aug 26 15:50:36 CEST 2008 - ug@suse.de + +- package automagic removed + +------------------------------------------------------------------- Mon Aug 25 14:07:52 CEST 2008 - ug@suse.de - post-patterns added Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=50382&r1=50381&r2=50382&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Tue Aug 26 15:51:58 2008 @@ -260,71 +260,6 @@ } } - 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; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org