December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60022 - in /trunk/installation: control/control.SLED.xml control/control.SLES.xml control/control.rnc package/yast2-installation.changes
by locilka＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: locilka Date: Wed Dec 9 14:15:36 2009 New Revision: 60022 URL: http://svn.opensuse.org/viewcvs/yast?rev=60022&view=rev Log: - Enabled CIM by default (SLES and SLED) (FATE #305583) - Adapted RNC for control files Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/control/control.rnc trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Wed Dec 9 14:15:36 2009 @@ -137,6 +137,8 @@ <ac_item>modem</ac_item> <ac_item>remote</ac_item> <ac_item>firewall</ac_item> +  + <ac_item>services</ac_item> </ac_items> </ac_step>  @@ -175,6 +177,19 @@  <default_ntp_setup config:type="boolean">false</default_ntp_setup> + +  + <services_proposal config:type="list"> +  + <service> +  + <label_id>service_sfcb</label_id> + <service_names>sfcb</service_names> + <firewall_plugins>sblim-sfcb</firewall_plugins> + <enabled_by_default config:type="boolean">true</enabled_by_default> + <packages>sblim-sfcb</packages> + </service> + </services_proposal> </globals> <software> @@ -350,6 +365,9 @@ <ac_2><label>Configuring network...</label></ac_2> <ac_3><label>Configuring hardware...</label></ac_3> <ac_4><label>Finishing configuration...</label></ac_4> + +  + <service_sfcb><label>CIM Server</label></service_sfcb> </texts> <proposals config:type="list"> @@ -521,6 +539,11 @@ <name>proxy</name> <presentation_order>70</presentation_order> </proposal_module> +  + <proposal_module> + <name>services</name> + <presentation_order>15</presentation_order> + </proposal_module> </proposal_modules> </proposal> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Wed Dec 9 14:15:36 2009 @@ -95,6 +95,19 @@  <polkit_default_privs>restrictive</polkit_default_privs> + +  + <services_proposal config:type="list"> +  + <service> +  + <label_id>service_sfcb</label_id> + <service_names>sfcb</service_names> + <firewall_plugins>sblim-sfcb</firewall_plugins> + <enabled_by_default config:type="boolean">true</enabled_by_default> + <packages>sblim-sfcb</packages> + </service> + </services_proposal> </globals> <software> @@ -312,6 +325,9 @@ <scenario_physical_machine><label>Physical Machine (Also for Fully Virtualized Guests)</label></scenario_physical_machine> <scenario_virtual_machine><label>Virtual Machine (For Paravirtualized Environments Like Xen)</label></scenario_virtual_machine> <scenario_virtualization_host><label>Xen Virtualization Host (Local X11 Not Configured by Default)</label></scenario_virtualization_host> + +  + <service_sfcb><label>CIM Server</label></service_sfcb> </texts> <proposals config:type="list"> @@ -636,6 +652,8 @@ <proposal_modules config:type="list"> <proposal_module>ca_mgm</proposal_module> <proposal_module>ldap-server</proposal_module> +  + <proposal_module>services</proposal_module> </proposal_modules> </proposal> Modified: trunk/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc… ============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Wed Dec 9 14:15:36 2009 @@ -84,6 +84,7 @@ | runlevel | debug_deploying | require_registration + | services_proposal additional_kernel_parameters = element additional_kernel_parameters { text } incomplete_translation_treshold = element incomplete_translation_treshold { text } @@ -173,6 +174,17 @@ }+ } +services_proposal = element services_proposal { + LIST, + element service { + element label_id { text }? & + element service_names { text } & + element firewall_plugins { text }? & + element enabled_by_default { BOOLEAN }? & + element packages { text }? + }+ +} + subworkflows = element subworkflows { LIST, element subworkflow { Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Dec 9 14:15:36 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 9 14:12:21 CET 2009 - locilka(a)suse.cz + +- Enabled CIM by default (SLES and SLED) (FATE #305583) +- Adapted RNC for control files + +------------------------------------------------------------------- Wed Dec 9 12:49:08 CET 2009 - jsrain(a)suse.cz - dereference hardlinks when deploying live CD so that it can -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60021 - in /branches/SuSE-Code-11-SP1-Branch/installation: VERSION control/control.SLED.xml control/control.SLES.xml control/control.rnc package/yast2-installation.changes
by locilka＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: locilka Date: Wed Dec 9 14:15:21 2009 New Revision: 60021 URL: http://svn.opensuse.org/viewcvs/yast?rev=60021&view=rev Log: - Enabled CIM by default (SLES and SLED) (FATE #305583) - Adapted RNC for control files - 2.17.61 Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/VERSION Wed Dec 9 14:15:21 2009 @@ -1 +1 @@ -2.17.60 +2.17.61 Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml Wed Dec 9 14:15:21 2009 @@ -126,6 +126,8 @@ <ac_item>modem</ac_item> <ac_item>remote</ac_item> <ac_item>firewall</ac_item> +  + <ac_item>services</ac_item> </ac_items> </ac_step>  @@ -162,6 +164,19 @@  <default_ntp_setup config:type="boolean">false</default_ntp_setup> + +  + <services_proposal config:type="list"> +  + <service> +  + <label_id>service_sfcb</label_id> + <service_names>sfcb</service_names> + <firewall_plugins>sblim-sfcb</firewall_plugins> + <enabled_by_default config:type="boolean">true</enabled_by_default> + <packages>sblim-sfcb</packages> + </service> + </services_proposal> </globals> <software> @@ -337,6 +352,9 @@ <ac_2><label>Configuring network...</label></ac_2> <ac_3><label>Configuring hardware...</label></ac_3> <ac_4><label>Finishing configuration...</label></ac_4> + +  + <service_sfcb><label>CIM Server</label></service_sfcb> </texts> <proposals config:type="list"> @@ -503,6 +521,11 @@ <name>proxy</name> <presentation_order>70</presentation_order> </proposal_module> +  + <proposal_module> + <name>services</name> + <presentation_order>15</presentation_order> + </proposal_module> </proposal_modules> </proposal> Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml Wed Dec 9 14:15:21 2009 @@ -95,6 +95,19 @@  <polkit_default_privs>restrictive</polkit_default_privs> + +  + <services_proposal config:type="list"> +  + <service> +  + <label_id>service_sfcb</label_id> + <service_names>sfcb</service_names> + <firewall_plugins>sblim-sfcb</firewall_plugins> + <enabled_by_default config:type="boolean">true</enabled_by_default> + <packages>sblim-sfcb</packages> + </service> + </services_proposal> </globals> <software> @@ -312,6 +325,9 @@ <scenario_physical_machine><label>Physical Machine (Also for Fully Virtualized Guests)</label></scenario_physical_machine> <scenario_virtual_machine><label>Virtual Machine (For Paravirtualized Environments Like Xen)</label></scenario_virtual_machine> <scenario_virtualization_host><label>Xen Virtualization Host (Local X11 Not Configured by Default)</label></scenario_virtualization_host> + +  + <service_sfcb><label>CIM Server</label></service_sfcb> </texts> <proposals config:type="list"> @@ -627,6 +643,8 @@ <proposal_modules config:type="list"> <proposal_module>ca_mgm</proposal_module> <proposal_module>ldap-server</proposal_module> +  + <proposal_module>services</proposal_module> </proposal_modules> </proposal> Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc Wed Dec 9 14:15:21 2009 @@ -82,6 +82,7 @@ | enable_autologin | runlevel | require_registration + | services_proposal additional_kernel_parameters = element additional_kernel_parameters { text } incomplete_translation_treshold = element incomplete_translation_treshold { text } @@ -164,6 +165,17 @@ }+ } +services_proposal = element services_proposal { + LIST, + element service { + element label_id { text }? & + element service_names { text } & + element firewall_plugins { text }? & + element enabled_by_default { BOOLEAN }? & + element packages { text }? + }+ +} + subworkflows = element subworkflows { LIST, element subworkflow { Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Wed Dec 9 14:15:21 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 9 14:12:21 CET 2009 - locilka(a)suse.cz + +- Enabled CIM by default (SLES and SLED) (FATE #305583) +- Adapted RNC for control files +- 2.17.61 + +------------------------------------------------------------------- Wed Dec 9 12:49:08 CET 2009 - jsrain(a)suse.cz - dereference hardlinks when deploying live CD so that it can -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60020 - /tags/branch-Code-11-SP1-2_17_115/network/
by mzugec＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: mzugec Date: Wed Dec 9 13:55:40 2009 New Revision: 60020 URL: http://svn.opensuse.org/viewcvs/yast?rev=60020&view=rev Log: Created tag branch-Code-11-SP1-2_17_115 for network Added: tags/branch-Code-11-SP1-2_17_115/network/ (props changed) - copied from r60019, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60019 - /tags/branch-Code-11-SP1-2_17_115/
by mzugec＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: mzugec Date: Wed Dec 9 13:55:34 2009 New Revision: 60019 URL: http://svn.opensuse.org/viewcvs/yast?rev=60019&view=rev Log: Created tag branch-Code-11-SP1-2_17_115 Added: tags/branch-Code-11-SP1-2_17_115/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60018 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: mzugec Date: Wed Dec 9 13:55:27 2009 New Revision: 60018 URL: http://svn.opensuse.org/viewcvs/yast?rev=60018&view=rev Log: disable IPv6 (bnc#561611) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Wed Dec 9 13:55:27 2009 @@ -1 +1 @@ -2.17.114 +2.17.115 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Wed Dec 9 13:55:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 9 13:54:27 CET 2009 - mzugec(a)suse.de + +- disable IPv6 (bnc#561611) +- 2.17.115 + +------------------------------------------------------------------- Mon Nov 30 09:50:12 CET 2009 - mzugec(a)suse.de - fixed testsuite Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Wed Dec 9 13:55:27 2009 @@ -75,6 +75,7 @@ // ipv6 module global boolean ipv6=true; + /** * Hotplug type ("" if not hot pluggable) */ @@ -158,6 +159,29 @@ //include "network/routines.ycp"; //include "network/runtime.ycp"; +void readIPv6(){ + ipv6=true; + + list<string> filelist = ["sysctl.conf"]; + string filepath = "/etc/"; + string regexp = "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1"; +// uncomment bellow to read from old place +// filelist = ["ipv6", "50-ipv6.conf"]; +// filepath ="/etc/modprobe.d/"; +// regexp = "^[[:space:]]*(install ipv6 /bin/true)"; + + foreach(string file, filelist,{ + string filename=sformat("%1/%2", filepath, file); + if (FileUtils::Exists(filename)){ + foreach(string row, splitstring((string)SCR::Read(.target.string, filename), "\n"), { + if (size(regexptokenize(String::CutBlanks(row), regexp))>0){ + y2milestone("IPv6 is disabled."); + ipv6=false; + } + }); + } + }); +} /** * Lan::Read (`cache) will do nothing if initialized already. @@ -255,9 +279,12 @@ ProgressNextStage(_("Reading network configuration...")); NetworkConfig::Read(); +/* if (FileUtils::Exists("/etc/modprobe.d/ipv6")){ if (((map<string, any>)SCR::Execute (.target.bash_output, "grep ipv6 /etc/modprobe.d/ipv6|cut -d# -f1|grep -q ipv6"))["exit"]:0==0) ipv6=false; } +*/ + readIPv6(); sleep(sl); @@ -325,7 +352,23 @@ } void writeIPv6(){ - SCR::Write(.target.string, "/etc/modprobe.d/ipv6", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); +// SCR::Write(.target.string, "/etc/modprobe.d/ipv6", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); +// uncomment to write to old place (and comment code bellow) +// SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); + string filename = "/etc/sysctl.conf"; + string sysctl = (string)SCR::Read(.target.string, filename); + string sysctl_row = sformat("%1net.ipv6.conf.all.disable_ipv6 = 1", ipv6?"# ":""); + boolean found = false; //size(regexptokenize(sysctl, "(net.ipv6.conf.all.disable_ipv6)"))>0; + list<string> file=[]; + foreach(string row, splitstring(sysctl, "\n"), { + if (size(regexptokenize(row, "(net.ipv6.conf.all.disable_ipv6)"))>0){ + row = sysctl_row; + found = true; + } + file=add(file, row); + }); + if (!found) file=add(file, sysctl_row); + SCR::Write(.target.string, filename, mergestring(file, "\n")); SCR::Write(.sysconfig.windowmanager.KDE_USE_IPV6, ipv6?"yes":"no"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60017 - in /trunk/runlevel: package/yast2-runlevel.changes src/Makefile.am src/RunlevelEd.ycp src/services_proposal.ycp
by locilka＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: locilka Date: Wed Dec 9 13:43:45 2009 New Revision: 60017 URL: http://svn.opensuse.org/viewcvs/yast?rev=60017&view=rev Log: Added new services proposal (FATE #305583) Added: trunk/runlevel/src/services_proposal.ycp Modified: trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/Makefile.am trunk/runlevel/src/RunlevelEd.ycp Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.… ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Wed Dec 9 13:43:45 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 9 13:40:07 CET 2009 - locilka(a)suse.cz + +- Added new services proposal (FATE #305583). + +------------------------------------------------------------------- Fri Mar 13 12:39:35 CET 2009 - locilka(a)suse.cz - Solving MenuButton shortcut conflicts (bnc #50003 c#39). Modified: trunk/runlevel/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/Makefile.am?rev=600… ============================================================================== --- trunk/runlevel/src/Makefile.am (original) +++ trunk/runlevel/src/Makefile.am Wed Dec 9 13:43:45 2009 @@ -18,7 +18,8 @@ runlevel.ycp \ runlevel_auto.ycp \ runlevel_finish.ycp \ - runlevel_proposal.ycp + runlevel_proposal.ycp \ + services_proposal.ycp myynclude_DATA = \ wizard.ycp \ Modified: trunk/runlevel/src/RunlevelEd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/RunlevelEd.ycp?rev=… ============================================================================== --- trunk/runlevel/src/RunlevelEd.ycp (original) +++ trunk/runlevel/src/RunlevelEd.ycp Wed Dec 9 13:43:45 2009 @@ -56,6 +56,11 @@ return offer_runlevel_4; } + global boolean configuration_already_loaded = false; + + global list <map <string, any> > services_proposal_settings = []; + global list <string> services_proposal_links = []; + /** * Proposal parameter: if it changes, we repropose */ Added: trunk/runlevel/src/services_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/services_proposal.y… ============================================================================== --- trunk/runlevel/src/services_proposal.ycp (added) +++ trunk/runlevel/src/services_proposal.ycp Wed Dec 9 13:43:45 2009 @@ -0,0 +1,539 @@ +/** + * File: clients/services_proposal.ycp + * Package: Services configuration + * Summary: Services configuration proposal + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * See: FATE #305583: Start CIMOM by default + * + * $Id$ + */ + +{ + +textdomain "runlevel"; + +import "RunlevelEd"; +import "Progress"; +import "ProductControl"; +import "ProductFeatures"; +import "Service"; +import "Linuxrc"; +import "Report"; +import "Package"; +import "SuSEFirewall"; + +/*** + * <globals> + *  + * <services_proposal config:type="list"> + *  + * <service> + * <label_id>service_sfcb</label_id> + *  + * <service_names>sfcb</service_names> + *  + * <firewall_plugins>sblim-sfcb</firewall_plugins> + *  + * <enabled_by_default config:type="boolean">true</enabled_by_default> + *  + * <packages>sblim-sfcb</packages> + * </service> + * </services_proposal> + * </globals> + * + * <texts> + * <service_sfcb><label>CIM Service</label></service_sfcb> + * </texts> + */ + +// Client operates differently in automatic configuration +boolean automatic_configuration = false; + +boolean GetCurrentStatus (list <string> services) { + if (services == nil || services == []) { + y2error ("Services not defined"); + return false; + } + + boolean ret = true; + + foreach (string service, services, { + if (Service::Status (service) != 0 || Service::Enabled (service) != true) { + ret = false; + y2milestone ("Service %1 is not running or it is disabled", service); + break; + } + }); + + return ret; +} + +void ReadCurrentConfiguration (boolean force) { + if (RunlevelEd::configuration_already_loaded != true || force == true) { + y2milestone ("Loading the current runlevel configuration"); + boolean progress_orig = Progress::set (false); + + RunlevelEd::Read(); + RunlevelEd::configuration_already_loaded = true; + + SuSEFirewall::Read(); + + list <map> tmp_services_settings = (list <map>) ProductFeatures::GetFeature("globals", "services_proposal"); + + if (tmp_services_settings == nil) { + y2error ("No globals->services_proposal defined"); + } else { + RunlevelEd::services_proposal_settings = []; + RunlevelEd::services_proposal_links = []; + integer counter = -1; + + foreach (map one_service, tmp_services_settings, { + // service_names requiered + if (! haskey(one_service, "service_names") || one_service["service_names"]:"" == nil) { + y2error ("Invalid service_names in %1, ignoring this service.", one_service); + return; + } + list <string> services = splitstring (one_service["service_names"]:"", " ,"); + if (services == nil || size(services) < 1) { + y2error ("Invalid service_names in %1, ignoring this service.", one_service); + return; + } + + // firewall_plugins are not required but they must be correct anyway + if (haskey(one_service, "firewall_plugins") && one_service["firewall_plugins"]:"" == nil) { + y2error ("Invalid firewall_plugins in %1, ignoring this service.", one_service); + return; + } + list <string> firewall_plugins = splitstring (one_service["firewall_plugins"]:"", " ,"); + + // default is: disabled + boolean enabled_by_default = false; + + // if defined, it must be boolean + if (haskey(one_service, "enabled_by_default")) { + if (one_service["enabled_by_default"]:false == true || one_service["enabled_by_default"]:false == false) { + enabled_by_default = one_service["enabled_by_default"]:false; + } else { + y2error ("Invalid enabled_by_default in %1, using: %2.", one_service, enabled_by_default); + } + } + + // fallback for label + string label = mergestring (services, ", "); + + if (haskey(one_service, "label_id") && one_service["label_id"]:"" == nil || one_service["label_id"]:"" == "") { + y2error ("Invalid label_id in %1, using %2", one_service, label); + } else { + string tmp_label = ProductControl::GetTranslatedText (one_service["label_id"]:""); + if (tmp_label == nil || tmp_label == "") { + label = one_service["label_id"]:""; + y2error ("Unable to translate %1", one_service["label_id"]:""); + } else { + label = tmp_label; + } + } + + // packages are not required but they must be correct anyway + if (haskey(one_service, "packages") && one_service["packages"]:"" == nil) { + y2error ("Invalid packages in %1, ignoring this service.", one_service); + return; + } + list <string> packages = splitstring (one_service["packages"]:"", " ,"); + + map <string, any> one_service = $[ + "label" : label, + "services" : services, + "firewall_plugins" : firewall_plugins, + // override the default status according to the current status + "enabled" : (enabled_by_default == false ? GetCurrentStatus(services):enabled_by_default), + "enabled_by_default" : enabled_by_default, + "packages" : packages, + ]; + + RunlevelEd::services_proposal_settings = add (RunlevelEd::services_proposal_settings, one_service); + + counter = counter + 1; + RunlevelEd::services_proposal_links = add (RunlevelEd::services_proposal_links, sformat ("toggle_service_%1", counter)); + }); + + y2milestone ("Default settings loaded: %1", RunlevelEd::services_proposal_settings); + } + + Progress::set (progress_orig); + } +} + +string GetProposalSummary () { + string ret = ""; + + boolean firewall_is_enabled = SuSEFirewall::IsEnabled(); + + integer counter = -1; + foreach (map <string, any> one_service, RunlevelEd::services_proposal_settings, { + counter = counter + 1; + string message = ""; + + // There are some ports (services) required to be open and firewall is enabled + if (size (one_service["firewall_plugins"]:[]) > 0 && firewall_is_enabled) { + if (one_service["enabled"]:false == true) { + message = sformat ( + _("Service %1 will be enabled and ports in firewall will be open <a href=\"%2\">(disable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } else { + message = sformat ( + _("Service %1 will be disabled and ports in firewall will be open <a href=\"%2\">(enable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } + } else { + if (one_service["enabled"]:false == true) { + message = sformat ( + _("Service %1 will be enabled <a href=\"%2\">(disable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } else { + message = sformat ( + _("Service %1 will be disabled <a href=\"%2\">(enable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } + } + + ret = ret + "<li>" + message + "</li>\n"; + }); + + return "<ul>" + ret + "</ul>"; +} + +/** + * Changes the proposed value. + * Enables disabled service and vice versa. + */ +boolean ToggleService (string chosen_id) { + if (! regexpmatch (chosen_id, "^toggle_service_[[:digit:]]+$")) { + y2error ("Erroneous ID: %1", chosen_id); + return false; + } + + chosen_id = regexpsub (chosen_id, "^toggle_service_([[:digit:]])+$", "\\1"); + if (chosen_id == nil) { + y2error ("Cannot get ID from: %1", chosen_id); + return false; + } + + integer ID = tointeger (chosen_id); + if (RunlevelEd::services_proposal_settings[ID]:$[] == nil || RunlevelEd::services_proposal_settings[ID]:$[] == $[]) { + y2error ("Cannot find service ID: %1 in %2", ID, RunlevelEd::services_proposal_settings); + return false; + } + + if (RunlevelEd::services_proposal_settings[ID,"enabled"]:false == nil) { + y2error ("Service %1 is neither enabled not disabled", RunlevelEd::services_proposal_settings[ID]:$[]); + return false; + } + + RunlevelEd::services_proposal_settings[ID,"enabled"] = ! RunlevelEd::services_proposal_settings[ID,"enabled"]:false; + y2milestone ("Service ID: %1 is enabled: %2", ID, RunlevelEd::services_proposal_settings[ID,"enabled"]:false); + return true; +} + +/** + * Some services should not be stopped, in respect to the currently + * used installation method. + */ +boolean CanCloseService (string service_name) { + if (Linuxrc::vnc() && service_name == "xinetd") { + return false; + } + if (Linuxrc::usessh() && service_name == "sshd") { + return false; + } + + return true; +} + +void DisableAndStopServices (list <string> services) { + foreach (string one_name, services, { + if (CanCloseService (one_name) != true) { + y2warning ("Service %1 must no be closed now", one_name); + } + + // Service is currently enabled or running + if (Service::Status (one_name) == 0 || Service::Enabled (one_name)) { + y2milestone ("Stopping and disabling service: %1", one_name); + Service::RunInitScriptWithTimeOut (one_name, "stop"); + Service::Disable (one_name); + } + }); +} + +/** + * Enables and starts services with their dependencies. + */ +boolean EnableAndStartServices (list <string> services) { + boolean ret = true; + + list <string> all_needed_services = []; + + // Find all the services dependencies first + foreach (string service, services, { + list <string> needed_services = RunlevelEd::ServiceDependencies (service, true); + + if (needed_services != nil && needed_services != []) { + y2milestone("Service dependencies for %1 are: %2", service, needed_services); + all_needed_services = (list <string>) union (all_needed_services, needed_services); + } + }); + + // Prepend services dependencies ... + all_needed_services = toset (all_needed_services); + // ... to list of services to enable + services = (list <string>) union (all_needed_services, services); + + foreach (string service, services, { + if (Service::Status (service) == -1) { + y2error ("Service name %1 is unknown", service); + Report::Error (sformat (_("Unable to start and enable service %1. +Service is not installed."), service)); + ret = false; + } else { + // Check and enable service + if (Service::Enabled (service) != true && Service::Enable (service) != true) { + y2error ("Unable to enable service %1", service); + Report::Error (sformat(_("Cannot enable service %1"), service)); + ret = false; + } + + // Check and start service + if (Service::RunInitScriptWithTimeOut (service, "status") != 0 && Service::RunInitScriptWithTimeOut (service, "start") != 0) { + y2error ("Unable to start service %1", service); + Report::Error (sformat(_("Cannot start service %1"), service)); + ret = false; + } + } + }); + + return ret; +} + +/** + * Opens ports using firewall services got as parameter. + * Services are actually in format "service_name", not + * "service:service_name". + */ +boolean OpenPortInFirewall (list <string> firewall_plugins) { + firewall_plugins = maplist (string one_plugin, firewall_plugins, { + return sformat ("service:%1", one_plugin); + }); + + // All interfaces known to firewall + list <string> interfaces = maplist (map one_interface, SuSEFirewall::GetAllKnownInterfaces(), { + return one_interface["id"]:""; + }); + + if (interfaces == nil) interfaces = []; + interfaces = filter (string one_interface, interfaces, { + return (one_interface != nil && one_interface != ""); + }); + y2milestone ("All known fw interfaces: %1", interfaces); + + // Services will be open in these zones + list <string> used_fw_zones = []; + + // All zones used by all interfaces (if any interface is known) + if (size (interfaces) > 0) { + used_fw_zones = SuSEFirewall::GetZonesOfInterfacesWithAnyFeatureSupported (interfaces); + // Opening for all zones otherwise + } else { + used_fw_zones = SuSEFirewall::GetKnownFirewallZones(); + } + + y2milestone ("Firewall zones: %1 for enabling services: %2, ", used_fw_zones, firewall_plugins); + return SuSEFirewall::SetServicesForZones (firewall_plugins, used_fw_zones, true); +} + +/** + * Checks which packages from those got as a list are not installed. + * Returns list of not installed packages. + * Eventually reports unavailable packages one by one. + */ +list <string> NotInstalledPackages (list <string> packages) { + list <string> not_installed = []; + + foreach (string one_package, packages, { + if (Package::Installed (one_package) != true) { + if (Package::Available (one_package) != true) { + Report::Error (sformat (_("Required package %1 is not available for installation."), one_package)); + } + not_installed = add (not_installed, one_package); + } + }); + + y2milestone ("Not installed packages: %1", not_installed); + return not_installed; +} + +boolean WriteSettings () { + boolean ret = true; + + boolean progress_orig = Progress::set (false); + boolean firewall_is_enabled = SuSEFirewall::IsEnabled(); + + integer counter = -1; + foreach (map <string, any> one_service, RunlevelEd::services_proposal_settings, { + counter = counter + 1; + + list <string> services = one_service["services"]:[]; + list <string> firewall_plugins = one_service["firewall_plugins"]:[]; + list <string> packages = one_service["packages"]:[]; + + // Service should be disabled + if (one_service["enabled"]:false != true) { + y2milestone ("Service %1 should not be enabled", counter); + DisableAndStopServices (services); + // next service + return; + } + + // Some packages have to be installed first + if (size (packages) > 0) { + boolean packages_installed = nil; + + // Returns which packages from list are not installed + packages = NotInstalledPackages (packages); + + // All are installed + if (packages == []) { + packages_installed = true; + // Install them + } else { + packages_installed = Package::DoInstall (packages); + } + + if (packages_installed == true) { + y2milestone ("Required packages for %1 are installed", counter); + } else { + Report::Error (_("Installation of required packages has failed, +enabling and starting the services may also fail.")); + } + } + + // Enabling services + if (EnableAndStartServices (services) != true) { + ret = false; + // next service + return; + } + + // Opening ports in firewall (only if firewall is enabled) + if (firewall_is_enabled == true && size(firewall_plugins) > 0) { + OpenPortInFirewall (firewall_plugins); + } + }); + + // Finally, write the firewall settings + SuSEFirewall::Write(); + + Progress::set (progress_orig); + + return ret; +} + +string GetHelpText () { + if (RunlevelEd::services_proposal_settings == nil || RunlevelEd::services_proposal_settings == []) { + // a help text, not very helpful though + return _("<big>Services</big> +The current setup does not provide any functionality now."); + } + + // a help text, part 1 + return _("<big>Services</big> +This installation proposal allows you to start and enable a service from list +of services.") + + // a help text, part 2 + _("It may also open ports in firewall for a service if firewall is enabled +and a particular service requires opening them."); +} + +/* The main () */ +y2milestone("----------------------------------------"); +y2milestone("Services proposal started"); +y2milestone("Arguments: %1", WFM::Args()); + +string func = (string) WFM::Args(0); +map param = (map) WFM::Args(1); +map ret = $[]; + +automatic_configuration = (param["AutomaticConfiguration"]:false == true); + +/* create a textual proposal */ +if(func == "MakeProposal") { + boolean progress_orig = Progress::set (false); + boolean force_reset = param["force_reset"]:false; + + ReadCurrentConfiguration (force_reset); + + ret = $[ + "preformatted_proposal" : GetProposalSummary(), + "warning_level" : `warning, + "warning" : nil, + "links" : RunlevelEd::services_proposal_links, + "help" : GetHelpText(), + ]; + y2internal ("RETURNED %1", ret); + + Progress::set (progress_orig); +} +/* run the module */ +else if(func == "AskUser") { + any chosen_id = param["chosen_id"]:nil; + y2milestone("Services Proposal wanted to change with id %1", chosen_id); + + /* + * When user clicks on any clickable <a href> in services proposal, + * one of these actions is called + */ + if (is (chosen_id, string) && regexpmatch (tostring (chosen_id), "^toggle_service_[[:digit:]]+$")) { + y2milestone ("Toggling service: %1", chosen_id); + ToggleService (tostring (chosen_id)); + ret = $[ "workflow_sequence" : `next ]; + + // Change the services settings in usual configuration dialogs + } else { + y2warning ("ID %1 is not handled", chosen_id); + ret = $[ "workflow_sequence" : `next ]; + } +} + +/* create titles */ +else if(func == "Description") { + ret = $[ + /* RichText label */ + "rich_text_title" : _("Services"), + /* Menu label */ + "menu_title" : _("&Services"), + "id" : "services", + ]; +} +/* write the proposal */ +else if(func == "Write") { + WriteSettings(); +} +/* unknown function */ +else { + y2error("unknown function: %1", func); +} + +/* Finish */ +y2debug("ret=%1",ret); +y2milestone("Services proposal finished"); +y2milestone("----------------------------------------"); +return ret; + +/* EOF */ +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60016 - in /branches/SuSE-Code-11-SP1-Branch/runlevel: package/yast2-runlevel.changes src/Makefile.am src/RunlevelEd.ycp src/services_proposal.ycp
by locilka＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: locilka Date: Wed Dec 9 13:43:35 2009 New Revision: 60016 URL: http://svn.opensuse.org/viewcvs/yast?rev=60016&view=rev Log: Added new services proposal (FATE #305583) Added: branches/SuSE-Code-11-SP1-Branch/runlevel/src/services_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes branches/SuSE-Code-11-SP1-Branch/runlevel/src/Makefile.am branches/SuSE-Code-11-SP1-Branch/runlevel/src/RunlevelEd.ycp Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/runle… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes Wed Dec 9 13:43:35 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 9 13:40:07 CET 2009 - locilka(a)suse.cz + +- Added new services proposal (FATE #305583). + +------------------------------------------------------------------- Fri Mar 13 12:39:35 CET 2009 - locilka(a)suse.cz - Solving MenuButton shortcut conflicts (bnc #50003 c#39). Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/runle… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/runlevel/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/runlevel/src/Makefile.am Wed Dec 9 13:43:35 2009 @@ -18,7 +18,8 @@ runlevel.ycp \ runlevel_auto.ycp \ runlevel_finish.ycp \ - runlevel_proposal.ycp + runlevel_proposal.ycp \ + services_proposal.ycp myynclude_DATA = \ wizard.ycp \ Modified: branches/SuSE-Code-11-SP1-Branch/runlevel/src/RunlevelEd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/runle… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/runlevel/src/RunlevelEd.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/runlevel/src/RunlevelEd.ycp Wed Dec 9 13:43:35 2009 @@ -56,6 +56,11 @@ return offer_runlevel_4; } + global boolean configuration_already_loaded = false; + + global list <map <string, any> > services_proposal_settings = []; + global list <string> services_proposal_links = []; + /** * Proposal parameter: if it changes, we repropose */ Added: branches/SuSE-Code-11-SP1-Branch/runlevel/src/services_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/runle… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/runlevel/src/services_proposal.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/runlevel/src/services_proposal.ycp Wed Dec 9 13:43:35 2009 @@ -0,0 +1,539 @@ +/** + * File: clients/services_proposal.ycp + * Package: Services configuration + * Summary: Services configuration proposal + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * See: FATE #305583: Start CIMOM by default + * + * $Id$ + */ + +{ + +textdomain "runlevel"; + +import "RunlevelEd"; +import "Progress"; +import "ProductControl"; +import "ProductFeatures"; +import "Service"; +import "Linuxrc"; +import "Report"; +import "Package"; +import "SuSEFirewall"; + +/*** + * <globals> + *  + * <services_proposal config:type="list"> + *  + * <service> + * <label_id>service_sfcb</label_id> + *  + * <service_names>sfcb</service_names> + *  + * <firewall_plugins>sblim-sfcb</firewall_plugins> + *  + * <enabled_by_default config:type="boolean">true</enabled_by_default> + *  + * <packages>sblim-sfcb</packages> + * </service> + * </services_proposal> + * </globals> + * + * <texts> + * <service_sfcb><label>CIM Service</label></service_sfcb> + * </texts> + */ + +// Client operates differently in automatic configuration +boolean automatic_configuration = false; + +boolean GetCurrentStatus (list <string> services) { + if (services == nil || services == []) { + y2error ("Services not defined"); + return false; + } + + boolean ret = true; + + foreach (string service, services, { + if (Service::Status (service) != 0 || Service::Enabled (service) != true) { + ret = false; + y2milestone ("Service %1 is not running or it is disabled", service); + break; + } + }); + + return ret; +} + +void ReadCurrentConfiguration (boolean force) { + if (RunlevelEd::configuration_already_loaded != true || force == true) { + y2milestone ("Loading the current runlevel configuration"); + boolean progress_orig = Progress::set (false); + + RunlevelEd::Read(); + RunlevelEd::configuration_already_loaded = true; + + SuSEFirewall::Read(); + + list <map> tmp_services_settings = (list <map>) ProductFeatures::GetFeature("globals", "services_proposal"); + + if (tmp_services_settings == nil) { + y2error ("No globals->services_proposal defined"); + } else { + RunlevelEd::services_proposal_settings = []; + RunlevelEd::services_proposal_links = []; + integer counter = -1; + + foreach (map one_service, tmp_services_settings, { + // service_names requiered + if (! haskey(one_service, "service_names") || one_service["service_names"]:"" == nil) { + y2error ("Invalid service_names in %1, ignoring this service.", one_service); + return; + } + list <string> services = splitstring (one_service["service_names"]:"", " ,"); + if (services == nil || size(services) < 1) { + y2error ("Invalid service_names in %1, ignoring this service.", one_service); + return; + } + + // firewall_plugins are not required but they must be correct anyway + if (haskey(one_service, "firewall_plugins") && one_service["firewall_plugins"]:"" == nil) { + y2error ("Invalid firewall_plugins in %1, ignoring this service.", one_service); + return; + } + list <string> firewall_plugins = splitstring (one_service["firewall_plugins"]:"", " ,"); + + // default is: disabled + boolean enabled_by_default = false; + + // if defined, it must be boolean + if (haskey(one_service, "enabled_by_default")) { + if (one_service["enabled_by_default"]:false == true || one_service["enabled_by_default"]:false == false) { + enabled_by_default = one_service["enabled_by_default"]:false; + } else { + y2error ("Invalid enabled_by_default in %1, using: %2.", one_service, enabled_by_default); + } + } + + // fallback for label + string label = mergestring (services, ", "); + + if (haskey(one_service, "label_id") && one_service["label_id"]:"" == nil || one_service["label_id"]:"" == "") { + y2error ("Invalid label_id in %1, using %2", one_service, label); + } else { + string tmp_label = ProductControl::GetTranslatedText (one_service["label_id"]:""); + if (tmp_label == nil || tmp_label == "") { + label = one_service["label_id"]:""; + y2error ("Unable to translate %1", one_service["label_id"]:""); + } else { + label = tmp_label; + } + } + + // packages are not required but they must be correct anyway + if (haskey(one_service, "packages") && one_service["packages"]:"" == nil) { + y2error ("Invalid packages in %1, ignoring this service.", one_service); + return; + } + list <string> packages = splitstring (one_service["packages"]:"", " ,"); + + map <string, any> one_service = $[ + "label" : label, + "services" : services, + "firewall_plugins" : firewall_plugins, + // override the default status according to the current status + "enabled" : (enabled_by_default == false ? GetCurrentStatus(services):enabled_by_default), + "enabled_by_default" : enabled_by_default, + "packages" : packages, + ]; + + RunlevelEd::services_proposal_settings = add (RunlevelEd::services_proposal_settings, one_service); + + counter = counter + 1; + RunlevelEd::services_proposal_links = add (RunlevelEd::services_proposal_links, sformat ("toggle_service_%1", counter)); + }); + + y2milestone ("Default settings loaded: %1", RunlevelEd::services_proposal_settings); + } + + Progress::set (progress_orig); + } +} + +string GetProposalSummary () { + string ret = ""; + + boolean firewall_is_enabled = SuSEFirewall::IsEnabled(); + + integer counter = -1; + foreach (map <string, any> one_service, RunlevelEd::services_proposal_settings, { + counter = counter + 1; + string message = ""; + + // There are some ports (services) required to be open and firewall is enabled + if (size (one_service["firewall_plugins"]:[]) > 0 && firewall_is_enabled) { + if (one_service["enabled"]:false == true) { + message = sformat ( + _("Service %1 will be enabled and ports in firewall will be open <a href=\"%2\">(disable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } else { + message = sformat ( + _("Service %1 will be disabled and ports in firewall will be open <a href=\"%2\">(enable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } + } else { + if (one_service["enabled"]:false == true) { + message = sformat ( + _("Service %1 will be enabled <a href=\"%2\">(disable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } else { + message = sformat ( + _("Service %1 will be disabled <a href=\"%2\">(enable)</a>"), + one_service["label"]:"", + sformat("toggle_service_%1", counter) + ); + } + } + + ret = ret + "<li>" + message + "</li>\n"; + }); + + return "<ul>" + ret + "</ul>"; +} + +/** + * Changes the proposed value. + * Enables disabled service and vice versa. + */ +boolean ToggleService (string chosen_id) { + if (! regexpmatch (chosen_id, "^toggle_service_[[:digit:]]+$")) { + y2error ("Erroneous ID: %1", chosen_id); + return false; + } + + chosen_id = regexpsub (chosen_id, "^toggle_service_([[:digit:]])+$", "\\1"); + if (chosen_id == nil) { + y2error ("Cannot get ID from: %1", chosen_id); + return false; + } + + integer ID = tointeger (chosen_id); + if (RunlevelEd::services_proposal_settings[ID]:$[] == nil || RunlevelEd::services_proposal_settings[ID]:$[] == $[]) { + y2error ("Cannot find service ID: %1 in %2", ID, RunlevelEd::services_proposal_settings); + return false; + } + + if (RunlevelEd::services_proposal_settings[ID,"enabled"]:false == nil) { + y2error ("Service %1 is neither enabled not disabled", RunlevelEd::services_proposal_settings[ID]:$[]); + return false; + } + + RunlevelEd::services_proposal_settings[ID,"enabled"] = ! RunlevelEd::services_proposal_settings[ID,"enabled"]:false; + y2milestone ("Service ID: %1 is enabled: %2", ID, RunlevelEd::services_proposal_settings[ID,"enabled"]:false); + return true; +} + +/** + * Some services should not be stopped, in respect to the currently + * used installation method. + */ +boolean CanCloseService (string service_name) { + if (Linuxrc::vnc() && service_name == "xinetd") { + return false; + } + if (Linuxrc::usessh() && service_name == "sshd") { + return false; + } + + return true; +} + +void DisableAndStopServices (list <string> services) { + foreach (string one_name, services, { + if (CanCloseService (one_name) != true) { + y2warning ("Service %1 must no be closed now", one_name); + } + + // Service is currently enabled or running + if (Service::Status (one_name) == 0 || Service::Enabled (one_name)) { + y2milestone ("Stopping and disabling service: %1", one_name); + Service::RunInitScriptWithTimeOut (one_name, "stop"); + Service::Disable (one_name); + } + }); +} + +/** + * Enables and starts services with their dependencies. + */ +boolean EnableAndStartServices (list <string> services) { + boolean ret = true; + + list <string> all_needed_services = []; + + // Find all the services dependencies first + foreach (string service, services, { + list <string> needed_services = RunlevelEd::ServiceDependencies (service, true); + + if (needed_services != nil && needed_services != []) { + y2milestone("Service dependencies for %1 are: %2", service, needed_services); + all_needed_services = (list <string>) union (all_needed_services, needed_services); + } + }); + + // Prepend services dependencies ... + all_needed_services = toset (all_needed_services); + // ... to list of services to enable + services = (list <string>) union (all_needed_services, services); + + foreach (string service, services, { + if (Service::Status (service) == -1) { + y2error ("Service name %1 is unknown", service); + Report::Error (sformat (_("Unable to start and enable service %1. +Service is not installed."), service)); + ret = false; + } else { + // Check and enable service + if (Service::Enabled (service) != true && Service::Enable (service) != true) { + y2error ("Unable to enable service %1", service); + Report::Error (sformat(_("Cannot enable service %1"), service)); + ret = false; + } + + // Check and start service + if (Service::RunInitScriptWithTimeOut (service, "status") != 0 && Service::RunInitScriptWithTimeOut (service, "start") != 0) { + y2error ("Unable to start service %1", service); + Report::Error (sformat(_("Cannot start service %1"), service)); + ret = false; + } + } + }); + + return ret; +} + +/** + * Opens ports using firewall services got as parameter. + * Services are actually in format "service_name", not + * "service:service_name". + */ +boolean OpenPortInFirewall (list <string> firewall_plugins) { + firewall_plugins = maplist (string one_plugin, firewall_plugins, { + return sformat ("service:%1", one_plugin); + }); + + // All interfaces known to firewall + list <string> interfaces = maplist (map one_interface, SuSEFirewall::GetAllKnownInterfaces(), { + return one_interface["id"]:""; + }); + + if (interfaces == nil) interfaces = []; + interfaces = filter (string one_interface, interfaces, { + return (one_interface != nil && one_interface != ""); + }); + y2milestone ("All known fw interfaces: %1", interfaces); + + // Services will be open in these zones + list <string> used_fw_zones = []; + + // All zones used by all interfaces (if any interface is known) + if (size (interfaces) > 0) { + used_fw_zones = SuSEFirewall::GetZonesOfInterfacesWithAnyFeatureSupported (interfaces); + // Opening for all zones otherwise + } else { + used_fw_zones = SuSEFirewall::GetKnownFirewallZones(); + } + + y2milestone ("Firewall zones: %1 for enabling services: %2, ", used_fw_zones, firewall_plugins); + return SuSEFirewall::SetServicesForZones (firewall_plugins, used_fw_zones, true); +} + +/** + * Checks which packages from those got as a list are not installed. + * Returns list of not installed packages. + * Eventually reports unavailable packages one by one. + */ +list <string> NotInstalledPackages (list <string> packages) { + list <string> not_installed = []; + + foreach (string one_package, packages, { + if (Package::Installed (one_package) != true) { + if (Package::Available (one_package) != true) { + Report::Error (sformat (_("Required package %1 is not available for installation."), one_package)); + } + not_installed = add (not_installed, one_package); + } + }); + + y2milestone ("Not installed packages: %1", not_installed); + return not_installed; +} + +boolean WriteSettings () { + boolean ret = true; + + boolean progress_orig = Progress::set (false); + boolean firewall_is_enabled = SuSEFirewall::IsEnabled(); + + integer counter = -1; + foreach (map <string, any> one_service, RunlevelEd::services_proposal_settings, { + counter = counter + 1; + + list <string> services = one_service["services"]:[]; + list <string> firewall_plugins = one_service["firewall_plugins"]:[]; + list <string> packages = one_service["packages"]:[]; + + // Service should be disabled + if (one_service["enabled"]:false != true) { + y2milestone ("Service %1 should not be enabled", counter); + DisableAndStopServices (services); + // next service + return; + } + + // Some packages have to be installed first + if (size (packages) > 0) { + boolean packages_installed = nil; + + // Returns which packages from list are not installed + packages = NotInstalledPackages (packages); + + // All are installed + if (packages == []) { + packages_installed = true; + // Install them + } else { + packages_installed = Package::DoInstall (packages); + } + + if (packages_installed == true) { + y2milestone ("Required packages for %1 are installed", counter); + } else { + Report::Error (_("Installation of required packages has failed, +enabling and starting the services may also fail.")); + } + } + + // Enabling services + if (EnableAndStartServices (services) != true) { + ret = false; + // next service + return; + } + + // Opening ports in firewall (only if firewall is enabled) + if (firewall_is_enabled == true && size(firewall_plugins) > 0) { + OpenPortInFirewall (firewall_plugins); + } + }); + + // Finally, write the firewall settings + SuSEFirewall::Write(); + + Progress::set (progress_orig); + + return ret; +} + +string GetHelpText () { + if (RunlevelEd::services_proposal_settings == nil || RunlevelEd::services_proposal_settings == []) { + // a help text, not very helpful though + return _("<big>Services</big> +The current setup does not provide any functionality now."); + } + + // a help text, part 1 + return _("<big>Services</big> +This installation proposal allows you to start and enable a service from list +of services.") + + // a help text, part 2 + _("It may also open ports in firewall for a service if firewall is enabled +and a particular service requires opening them."); +} + +/* The main () */ +y2milestone("----------------------------------------"); +y2milestone("Services proposal started"); +y2milestone("Arguments: %1", WFM::Args()); + +string func = (string) WFM::Args(0); +map param = (map) WFM::Args(1); +map ret = $[]; + +automatic_configuration = (param["AutomaticConfiguration"]:false == true); + +/* create a textual proposal */ +if(func == "MakeProposal") { + boolean progress_orig = Progress::set (false); + boolean force_reset = param["force_reset"]:false; + + ReadCurrentConfiguration (force_reset); + + ret = $[ + "preformatted_proposal" : GetProposalSummary(), + "warning_level" : `warning, + "warning" : nil, + "links" : RunlevelEd::services_proposal_links, + "help" : GetHelpText(), + ]; + y2internal ("RETURNED %1", ret); + + Progress::set (progress_orig); +} +/* run the module */ +else if(func == "AskUser") { + any chosen_id = param["chosen_id"]:nil; + y2milestone("Services Proposal wanted to change with id %1", chosen_id); + + /* + * When user clicks on any clickable <a href> in services proposal, + * one of these actions is called + */ + if (is (chosen_id, string) && regexpmatch (tostring (chosen_id), "^toggle_service_[[:digit:]]+$")) { + y2milestone ("Toggling service: %1", chosen_id); + ToggleService (tostring (chosen_id)); + ret = $[ "workflow_sequence" : `next ]; + + // Change the services settings in usual configuration dialogs + } else { + y2warning ("ID %1 is not handled", chosen_id); + ret = $[ "workflow_sequence" : `next ]; + } +} + +/* create titles */ +else if(func == "Description") { + ret = $[ + /* RichText label */ + "rich_text_title" : _("Services"), + /* Menu label */ + "menu_title" : _("&Services"), + "id" : "services", + ]; +} +/* write the proposal */ +else if(func == "Write") { + WriteSettings(); +} +/* unknown function */ +else { + y2error("unknown function: %1", func); +} + +/* Finish */ +y2debug("ret=%1",ret); +y2milestone("Services proposal finished"); +y2milestone("----------------------------------------"); +return ret; + +/* EOF */ +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60015 - in /branches/SuSE-Code-11-SP1-Branch/installation: package/yast2-installation.changes src/modules/ImageInstallation.ycp
by jsrain＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: jsrain Date: Wed Dec 9 12:53:00 2009 New Revision: 60015 URL: http://svn.opensuse.org/viewcvs/yast?rev=60015&view=rev Log: dereference hardlinks when deploying live CD so that it can be also deployed on multiple separate partitions (bnc#549158) Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/modules/ImageInstallation.ycp Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Wed Dec 9 12:53:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 9 12:49:08 CET 2009 - jsrain(a)suse.cz + +- dereference hardlinks when deploying live CD so that it can + be also deployed on multiple separate partitions (bnc#549158) + +------------------------------------------------------------------- Mon Nov 30 14:38:26 CET 2009 - locilka(a)suse.cz - Repositories added by inst_addon_update_sources use Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/modules/ImageInstallation.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/modules/ImageInstallation.ycp Wed Dec 9 12:53:00 2009 @@ -889,7 +889,7 @@ cmd = sformat ( "mkfifo %3 ; mkfifo %4 ; - tar -C %1 --numeric-owner -cSf %3 --one-file-system . & + tar -C %1 --hard-dereference --numeric-owner -cSf %3 --one-file-system . & dd bs=1048576 if=%3 of=%4 >&2 & jobs -l >&2; tar -C %2 --numeric-owner -xSf %4", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60014 - in /branches/SuSE-Linux-11_2-Branch/installation: package/yast2-installation.changes src/modules/ImageInstallation.ycp
by jsrain＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: jsrain Date: Wed Dec 9 12:51:17 2009 New Revision: 60014 URL: http://svn.opensuse.org/viewcvs/yast?rev=60014&view=rev Log: dereference hardlinks when deploying live CD so that it can be also deployed on multiple separate partitions (bnc#549158) Modified: branches/SuSE-Linux-11_2-Branch/installation/package/yast2-installation.changes branches/SuSE-Linux-11_2-Branch/installation/src/modules/ImageInstallation.ycp Modified: branches/SuSE-Linux-11_2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/instal… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Linux-11_2-Branch/installation/package/yast2-installation.changes Wed Dec 9 12:51:17 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 9 12:49:08 CET 2009 - jsrain(a)suse.cz + +- dereference hardlinks when deploying live CD so that it can + be also deployed on multiple separate partitions (bnc#549158) + +------------------------------------------------------------------- Fri Oct 23 07:40:56 CEST 2009 - jsuchome(a)suse.cz - during update, do not save timezone and console settings Modified: branches/SuSE-Linux-11_2-Branch/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/instal… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/installation/src/modules/ImageInstallation.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/installation/src/modules/ImageInstallation.ycp Wed Dec 9 12:51:17 2009 @@ -907,7 +907,7 @@ cmd = sformat ( "mkfifo %3 ; mkfifo %4 ; - tar -C %1 --numeric-owner -cSf %3 --one-file-system . & + tar -C %1 --hard-dereference --numeric-owner -cSf %3 --one-file-system . & dd bs=1048576 if=%3 of=%4 >&2 & jobs -l >&2; tar -C %2 --numeric-owner -xSf %4", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60013 - in /trunk/installation: package/yast2-installation.changes src/modules/ImageInstallation.ycp
by jsrain＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: jsrain Date: Wed Dec 9 12:50:35 2009 New Revision: 60013 URL: http://svn.opensuse.org/viewcvs/yast?rev=60013&view=rev Log: dereference hardlinks when deploying live CD so that it can be also deployed on multiple separate partitions (bnc#549158) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Dec 9 12:50:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 9 12:49:08 CET 2009 - jsrain(a)suse.cz + +- dereference hardlinks when deploying live CD so that it can + be also deployed on multiple separate partitions (bnc#549158) + +------------------------------------------------------------------- Mon Nov 30 14:38:26 CET 2009 - locilka(a)suse.cz - Repositories added by inst_addon_update_sources use Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Wed Dec 9 12:50:35 2009 @@ -907,7 +907,7 @@ cmd = sformat ( "mkfifo %3 ; mkfifo %4 ; - tar -C %1 --numeric-owner -cSf %3 --one-file-system . & + tar -C %1 --hard-dereference --numeric-owner -cSf %3 --one-file-system . & dd bs=1048576 if=%3 of=%4 >&2 & jobs -l >&2; tar -C %2 --numeric-owner -xSf %4", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0