Author: ug Date: Wed Jun 25 16:23:37 2008 New Revision: 48533 URL: http://svn.opensuse.org/viewcvs/yast?rev=48533&view=rev Log: proposal selection possible via autoyast profile (fate#302946). 2.17.1 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstConfig.ycp trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=4853... ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Jun 25 16:23:37 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast... ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jun 25 16:23:37 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 25 16:19:11 CEST 2008 - ug@suse.de + +- proposal selection possible via autoyast profile (fate#302946) +- 2.17.1 + +------------------------------------------------------------------- Mon Jun 23 12:47:17 CEST 2008 - ug@suse.de - if mountpoint is swap, filesystem is set to swap too Modified: trunk/autoinstallation/src/modules/AutoinstConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Auto... ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstConfig.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstConfig.ycp Wed Jun 25 16:23:37 2008 @@ -167,6 +167,14 @@ // before the probing stage DASD module can has run // global boolean remoteProfile = true; + global list<string> Proposals = []; + + global list<string> getProposalList() { + return Proposals; + } + global void setProposalList(list<string> l) { + Proposals = l; + } include "autoinstall/io.ycp"; Modified: trunk/autoinstallation/src/modules/AutoinstGeneral.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Auto... ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstGeneral.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Wed Jun 25 16:23:37 2008 @@ -44,6 +44,9 @@ global list askList = []; +// global list<string> proposals = ["bootloader_proposal", "software_proposal", "country_simple_proposal", "timezone_proposal", "users_proposal", "runlevel_proposal", "hwinfo_proposal", "mouse_proposal", "deploying_proposal"]; + global list<string> proposals = []; + /* default value of settings modified */ global boolean modified = false; @@ -121,6 +124,11 @@ summary = Summary::AddLine(summary, (AutoinstGeneral::signature_handling["import_gpg_key"]:false) ? _("Importing new GPG keys") : _("Not importing new GPG Keys")); + summary = Summary::AddHeader(summary, _("Proposals")); + foreach(string p, proposals, ``{ + summary = Summary::AddLine(summary, p); + }); + return summary; } @@ -137,6 +145,7 @@ mode = settings["mode"]:$[]; signature_handling = settings["signature-handling"]:$[]; askList = settings["ask-list"]:[]; + proposals = settings["proposals"]:[]; return true; } @@ -164,6 +173,7 @@ general["mode"] = mode; general["signature-handling"] = signature_handling; general["ask-list"] = askList; + general["proposals"] = proposals; return general; } @@ -217,6 +227,7 @@ ProductFeatures::SetBooleanFeature( "globals", "kexec_reboot", !mode["forceboot"]:false ); AutoinstConfig::Halt = mode["halt"]:false; AutoinstConfig::RebootMsg = mode["rebootmsg"]:false; + AutoinstConfig::setProposalList( proposals ); // // mouse -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org