February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55705 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/widgets.ycp
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 12:25:36 2009 New Revision: 55705 URL: http://svn.opensuse.org/viewcvs/yast?rev=55705&view=rev Log: toggle between "manual", "automatic", "onboot" (bnc#457252) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=55705&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Tue Feb 24 12:25:36 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Tue Feb 24 12:25:36 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 24 12:24:55 CET 2009 - mzugec(a)suse.cz + +- toggle between "manual", "automatic", "onboot" (bnc#457252) +- 2.18.2 + +------------------------------------------------------------------- Mon Jan 26 14:42:53 CET 2009 - mzugec(a)suse.cz - button labeling (bnc#440542) Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Tue Feb 24 12:25:36 2009 @@ -149,14 +149,18 @@ y2milestone("toggle record %1", record); string startup = IscsiClientLib::getStartupStatus(record); if (size(startup)>0){ - if (startup == "manual"){ - y2milestone("Change status for %1 to %2", record, "onboot"); - IscsiClientLib::setStartupStatus(record, "onboot"); - } - else { - y2milestone("Change status for %1 to %2", record, "manual"); - IscsiClientLib::setStartupStatus(record, "manual"); - } + // toggle all 3 possible values (bnc#457252) + list <string> options = ["manual", "onboot", "automatic"]; + integer pos=0; + foreach(string option, options, { + if (startup==option){ + startup=options[(size(options)>pos+1) ? pos+1 : 0]:""; + y2milestone("Changing state from %1 to %2", option, startup ); + IscsiClientLib::setStartupStatus(record, startup); + break; + } + pos=pos+1; + }); initConnectedTable(""); } } else Popup::Error(_("No record found.")); -- 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] r55704 - /tags/branch-Code-11-2_17_8/iscsi-client/
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 12:17:25 2009 New Revision: 55704 URL: http://svn.opensuse.org/viewcvs/yast?rev=55704&view=rev Log: Created tag branch-Code-11-2_17_8 for iscsi-client Added: tags/branch-Code-11-2_17_8/iscsi-client/ - copied from r55703, branches/SuSE-Code-11-Branch/iscsi-client/ -- 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] r55703 - in /branches/SuSE-Code-11-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/widgets.ycp
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 12:17:11 2009 New Revision: 55703 URL: http://svn.opensuse.org/viewcvs/yast?rev=55703&view=rev Log: toggle between "manual", "automatic", "onboot" (bnc#457252) Modified: branches/SuSE-Code-11-Branch/iscsi-client/VERSION branches/SuSE-Code-11-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-Branch/iscsi-client/src/widgets.ycp Modified: branches/SuSE-Code-11-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/iscsi-cli… ============================================================================== --- branches/SuSE-Code-11-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-Branch/iscsi-client/VERSION Tue Feb 24 12:17:11 2009 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: branches/SuSE-Code-11-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/iscsi-cli… ============================================================================== --- branches/SuSE-Code-11-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-Branch/iscsi-client/package/yast2-iscsi-client.changes Tue Feb 24 12:17:11 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 24 12:08:35 CET 2009 - mzugec(a)suse.cz + +- toggle between "manual", "automatic", "onboot" (bnc#457252) +- 2.17.8 + +------------------------------------------------------------------- Tue Jan 20 10:01:08 CET 2009 - mzugec(a)suse.cz - fixed check InitiatorName function (bnc#460176) Modified: branches/SuSE-Code-11-Branch/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/iscsi-cli… ============================================================================== --- branches/SuSE-Code-11-Branch/iscsi-client/src/widgets.ycp (original) +++ branches/SuSE-Code-11-Branch/iscsi-client/src/widgets.ycp Tue Feb 24 12:17:11 2009 @@ -149,14 +149,18 @@ y2milestone("toggle record %1", record); string startup = IscsiClientLib::getStartupStatus(record); if (size(startup)>0){ - if (startup == "manual"){ - y2milestone("Change status for %1 to %2", record, "onboot"); - IscsiClientLib::setStartupStatus(record, "onboot"); - } - else { - y2milestone("Change status for %1 to %2", record, "manual"); - IscsiClientLib::setStartupStatus(record, "manual"); - } + // toggle all 3 possible values (bnc#457252) + list <string> options = ["manual", "onboot", "automatic"]; + integer pos=0; + foreach(string option, options, { + if (startup==option){ + startup=options[(size(options)>pos+1) ? pos+1 : 0]:""; + y2milestone("Changing state from %1 to %2", option, startup ); + IscsiClientLib::setStartupStatus(record, startup); + break; + } + pos=pos+1; + }); initConnectedTable(""); } } else Popup::Error(_("No record found.")); -- 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] r55702 - /trunk/cluster/src/Makefile.in
by xwhu＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: xwhu Date: Tue Feb 24 07:42:50 2009 New Revision: 55702 URL: http://svn.opensuse.org/viewcvs/yast?rev=55702&view=rev Log: Remove Cluster2.pm and Cluster3.py in Makefile.in Modified: trunk/cluster/src/Makefile.in Modified: trunk/cluster/src/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/Makefile.in?rev=5570… ============================================================================== --- trunk/cluster/src/Makefile.in (original) +++ trunk/cluster/src/Makefile.in Tue Feb 24 07:42:50 2009 @@ -198,9 +198,7 @@ cluster.desktop module_DATA = \ - Cluster.ycp \ - Cluster2.pm \ - Cluster3.py + Cluster.ycp ycpchook = cluster EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) -- 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] r55701 - /trunk/cluster/src/dialogs.ycp
by xwhu＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: xwhu Date: Tue Feb 24 07:41:34 2009 New Revision: 55701 URL: http://svn.opensuse.org/viewcvs/yast?rev=55701&view=rev Log: Change the validate notification Modified: trunk/cluster/src/dialogs.ycp Modified: trunk/cluster/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/dialogs.ycp?rev=5570… ============================================================================== --- trunk/cluster/src/dialogs.ycp (original) +++ trunk/cluster/src/dialogs.ycp Tue Feb 24 07:41:34 2009 @@ -47,53 +47,54 @@ boolean ValidateCommunication () { - boolean ret = true; - foreach(symbol tid, [`bindnetaddr1, `mcastaddr1, ], { - if (IP::Check((string)UI::QueryWidget(`id(tid), `Value)) == false) { - Popup::Message("Must input Network Address"); - UI::SetFocus(tid); - ret = false; - } - }); - foreach(symbol tid, [`mcastport1], { - if (!regexpmatch((string)UI::QueryWidget(`id(tid), `Value), "^[0-9]+$")) { - Popup::Message("Must input integer"); - UI::SetFocus(`id(tid)); - ret = false; - } - }); + if (IP::Check((string)UI::QueryWidget(`id(`bindnetaddr1), `Value)) == false) { + Popup::Message("The Bind Network Address has to be fulfilled"); + UI::SetFocus(`bindnetaddr1); + return false; + } + if (IP::Check((string)UI::QueryWidget(`id(`mcastaddr1), `Value)) == false) { + Popup::Message("The Multicast Address has to be fulfilled"); + UI::SetFocus(`mcastaddr1); + return false; + } + if (!regexpmatch((string)UI::QueryWidget(`id(`mcastport1), `Value), "^[0-9]+$")) { + Popup::Message("The Multicast port must be a positive integer"); + UI::SetFocus(`id(`mcastport1)); + return false; + } if (UI::QueryWidget(`id(`autoid), `Value) == false) { string noid = (string)UI::QueryWidget(`id(`nodeid), `Value); boolean s = regexpmatch(noid, "^[0-9]+$"); if (!s) { - Popup::Message("Must input integer"); + Popup::Message("Node ID has to be a positive integer"); UI::SetFocus(`id(`nodeid)); - ret = false; + return false; } integer i = tointeger(noid); if (i == 0) { Popup::Message("NodeID 0 is reserved"); UI::SetFocus(`id(`nodeid)); - ret = false; + return false; } } if (UI::QueryWidget(`id(`enable2), `Value) == true) { - foreach(symbol tid, [`bindnetaddr2, `mcastaddr2, ], { - if (IP::Check((string)UI::QueryWidget(`id(tid), `Value)) == false) { - Popup::Message("Must input Network Address"); - UI::SetFocus(tid); - ret = false; - } - }); - foreach(symbol tid, [`mcastport2], { - if (!regexpmatch((string)UI::QueryWidget(`id(tid), `Value), "^[0-9]+$")) { - Popup::Message("Must input integer"); - UI::SetFocus(`id(tid)); - ret = false; - } - }); + if (IP::Check((string)UI::QueryWidget(`id(`bindnetaddr2), `Value)) == false) { + Popup::Message("The Bind Network Address has to be fulfilled"); + UI::SetFocus(`bindnetaddr2); + return false; + } + if (IP::Check((string)UI::QueryWidget(`id(`mcastaddr2), `Value)) == false) { + Popup::Message("The Multicast Address has to be fulfilled"); + UI::SetFocus(`mcastaddr2); + return false; + } + if (!regexpmatch((string)UI::QueryWidget(`id(`mcastport2), `Value), "^[0-9]+$")) { + Popup::Message("The Multicast port must be a positive integer"); + UI::SetFocus(`id(`mcastport2)); + return false; + } } - return ret; + return true; } void SaveCommunicationToConf () -- 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] r55700 - /trunk/cluster/src/wizards.ycp
by xwhu＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: xwhu Date: Tue Feb 24 07:40:36 2009 New Revision: 55700 URL: http://svn.opensuse.org/viewcvs/yast?rev=55700&view=rev Log: Rename the help button Modified: trunk/cluster/src/wizards.ycp Modified: trunk/cluster/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/wizards.ycp?rev=5570… ============================================================================== --- trunk/cluster/src/wizards.ycp (original) +++ trunk/cluster/src/wizards.ycp Tue Feb 24 07:40:36 2009 @@ -67,7 +67,7 @@ Wizard::SetNextButton(`next, Label::FinishButton()); if (UI::WidgetExists(`id(`wizardTree))) { - Wizard::SetBackButton(`help, Label::HelpButton()); + Wizard::SetBackButton(`help_button, Label::HelpButton()); Wizard::SetAbortButton(`abort, Label::CancelButton()); } else { UI::WizardCommand(`SetNextButtonLabel( Label::FinishButton() ) ); -- 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] r55699 - in /trunk/cluster/src: dialogs.ycp helps.ycp
by xwhu＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: xwhu Date: Tue Feb 24 07:39:56 2009 New Revision: 55699 URL: http://svn.opensuse.org/viewcvs/yast?rev=55699&view=rev Log: Cleanup inlined documents Modified: trunk/cluster/src/dialogs.ycp trunk/cluster/src/helps.ycp Modified: trunk/cluster/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/dialogs.ycp?rev=5569… ============================================================================== --- trunk/cluster/src/dialogs.ycp (original) +++ trunk/cluster/src/dialogs.ycp Tue Feb 24 07:39:56 2009 @@ -426,7 +426,7 @@ if (ret == 0) { UI::ChangeWidget(`id(`status), `Value, _("Running")); } else { - UI::ChangeWidget(`id(`status), `Value, _("Not running")); + UI::ChangeWidget(`id(`status), `Value, _("Not run")); } UI::ChangeWidget (`id ("start_now"), `Enabled, ret != 0); UI::ChangeWidget (`id ("stop_now"), `Enabled, ret == 0); Modified: trunk/cluster/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/helps.ycp?rev=55699&… ============================================================================== --- trunk/cluster/src/helps.ycp (original) +++ trunk/cluster/src/helps.ycp Tue Feb 24 07:39:56 2009 @@ -36,17 +36,20 @@ */ map HELPS = $[ - "communication" : _("<big>bindnetaddr</big> This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0. This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified. -<big>mcastaddr</big>This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address. This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified. -<big>mcastport</big>This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports. -<big>nodeid</big>This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used. -<big>rrp_mode</big>This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly dou- ble the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem proto- col. If only one interface directive is specified, none is automati- cally chosen. If multiple interface directives are specified, only active or passive may be chosen. + "communication" : _("<big>Bind Network Address</big> This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0. This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified. +<big>Multicast Address</big> This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address. This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified. +<big>Multicast Port</big> This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports. +<big>Node ID</big> This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used. +<big>rrp_mode</big> This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly dou- ble the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem proto- col. If only one interface directive is specified, none is automati- cally chosen. If multiple interface directives are specified, only active or passive may be chosen. "), "security" : _(" -<big>threads</big>This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. -<big>secauth</big> This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authen- tication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100mbit networks with 1500 MTU frame transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this option is enabled on 3ghz cpus. A throughput of 10mb/sec is possible wth 20% cpu utilization when this optin is disabled on 3ghz cpus. For gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this option is enabled on 3ghz cpus. A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus. The default is on. +<big>Threads</big> This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. +<big>Enable Security Auth</big> This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100mbit networks with 1500 MTU frame transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this option is enabled on 3ghz cpus. A throughput of 10mb/sec is possible wth 20% cpu utilization when this optin is disabled on 3ghz cpus. For gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this option is enabled on 3ghz cpus. A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus. The default is on. "), - "service" : _(""), + "service" : _(" + <big>Booting</big> Starting openais service during boot or not + <big>Start mgmtd</big> Mgmtd daemon is a standalone service daemon. It is required by the GUI + "), /* Read dialog help 1/2 */ "read" : _("<big>Initializing cluster Configuration</big> Please wait... -- 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] r55698 - /trunk/cluster/src/dialogs.ycp
by xwhu＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: xwhu Date: Tue Feb 24 07:39:12 2009 New Revision: 55698 URL: http://svn.opensuse.org/viewcvs/yast?rev=55698&view=rev Log: Fix checking service enablement Modified: trunk/cluster/src/dialogs.ycp Modified: trunk/cluster/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/dialogs.ycp?rev=5569… ============================================================================== --- trunk/cluster/src/dialogs.ycp (original) +++ trunk/cluster/src/dialogs.ycp Tue Feb 24 07:39:12 2009 @@ -433,7 +433,7 @@ map result = $[]; result = (map)SCR::Execute(.target.bash_output, "/sbin/chkconfig openais 2>/dev/null | awk '{print $2}'"); - if (find(result["stdout"]:"","off") != nil) { + if (find(result["stdout"]:"","off") != -1) { UI::ChangeWidget(`id("off"), `Value, true); UI::ChangeWidget(`id("on"), `Value, false); } else { -- 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] r55697 - in /trunk/cluster/src: Cluster.ycp common.ycp dialogs.ycp
by xwhu＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: xwhu Date: Tue Feb 24 07:38:23 2009 New Revision: 55697 URL: http://svn.opensuse.org/viewcvs/yast?rev=55697&view=rev Log: Add support to SuSEFirewall. Modified: trunk/cluster/src/Cluster.ycp trunk/cluster/src/common.ycp trunk/cluster/src/dialogs.ycp Modified: trunk/cluster/src/Cluster.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/Cluster.ycp?rev=5569… ============================================================================== --- trunk/cluster/src/Cluster.ycp (original) +++ trunk/cluster/src/Cluster.ycp Tue Feb 24 07:38:23 2009 @@ -40,6 +40,7 @@ import "Summary"; import "Message"; import "PackageSystem"; +import "SuSEFirewall"; /** * Prototypes @@ -255,14 +256,14 @@ /* Progress stage 2/3 */ _("Read the previous settings"), /* Progress stage 3/3 */ - _("Detect the devices") + _("Read SuSEFirewall Settings") ], [ /* Progress step 1/3 */ _("Reading the database..."), /* Progress step 2/3 */ _("Reading the previous settings..."), /* Progress step 3/3 */ - _("Detecting the devices..."), + _("Reading SuSEFirewall settings..."), /* Progress finished */ _("Finished") ], @@ -309,6 +310,13 @@ sleep(sl); // detect devices + SuSEFirewall::Read(); + if (mcastport1 != "" && SuSEFirewall::HaveService(mcastport1, "UDP", "EXT")) { + SuSEFirewall::RemoveService(mcastport1, "UDP", "EXT"); + } + if (enable2 && mcastport2 != "" && SuSEFirewall::HaveService(mcastport2, "UDP", "EXT")) { + SuSEFirewall::RemoveService(mcastport2, "UDP", "EXT"); + } if(Abort()) return false; Progress::NextStage(); /* Error message */ @@ -346,12 +354,12 @@ /* Progress stage 1/2 */ _("Write the settings"), /* Progress stage 2/2 */ - _("Run SuSEconfig") + _("Save changes to SuSEFirewall") ], [ /* Progress step 1/2 */ _("Writing the settings..."), /* Progress step 2/2 */ - _("Running SuSEconfig..."), + _("Saving changes to SuSEFirewall..."), /* Progress finished */ _("Finished") ], @@ -366,13 +374,26 @@ if(false) Report::Error (_("Cannot write settings.")); sleep(sl); + /* Work with SuSEFirewall */ + if (use_mgmtd == true) { + SuSEFirewall::AddService("5560", "TCP", "EXT"); + } else { + SuSEFirewall::RemoveService("5560", "TCP", "EXT"); + } + SuSEFirewall::AddService(mcastport1, "UDP", "EXT"); + if (enable2 == true) { + SuSEFirewall::AddService(mcastport2, "UDP", "EXT"); + } + // run SuSEconfig + SuSEFirewall::Write(); if(Abort()) return false; Progress::NextStage (); /* Error message */ if(false) Report::Error (Message::SuSEConfigFailed()); sleep(sl); + SuSEFirewall::ActivateConfiguration(); if(Abort()) return false; /* Progress finished */ Progress::NextStage(); Modified: trunk/cluster/src/common.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/common.ycp?rev=55697… ============================================================================== --- trunk/cluster/src/common.ycp (original) +++ trunk/cluster/src/common.ycp Tue Feb 24 07:38:23 2009 @@ -7,6 +7,9 @@ import "Cluster"; import "Popup"; import "CWM"; + import "CWMFirewallInterfaces"; + import "SuSEFirewall"; + import "SuSEFirewallServices"; list<string> DIALOG = [ "communication", Modified: trunk/cluster/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/dialogs.ycp?rev=5569… ============================================================================== --- trunk/cluster/src/dialogs.ycp (original) +++ trunk/cluster/src/dialogs.ycp Tue Feb 24 07:38:23 2009 @@ -38,6 +38,9 @@ import "Popup"; import "Service"; import "Report"; +import "CWMFirewallInterfaces"; +import "SuSEFirewall"; +import "SuSEFirewallServices"; include "cluster/helps.ycp"; include "cluster/common.ycp"; @@ -442,6 +445,14 @@ any ServiceDialog () { any ret = nil; + /* + map<string, any> firewall_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ + "services" : [ "port:5141" ], + "display_details" : true, + ]); + term firewall_layout = firewall_widget["custom_widget"]:`VBox(); + */ + term contents = `VBox( `VSpacing(1), @@ -469,7 +480,7 @@ ))) )) ), - +// `Frame (_("Firewall Settings"), firewall_layout), `VStretch() ); -- 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] r55696 - /trunk/cluster/src/dialogs.ycp
by xwhu＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: xwhu Date: Tue Feb 24 07:36:03 2009 New Revision: 55696 URL: http://svn.opensuse.org/viewcvs/yast?rev=55696&view=rev Log: Save the configuration before restarting service Modified: trunk/cluster/src/dialogs.ycp Modified: trunk/cluster/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/dialogs.ycp?rev=5569… ============================================================================== --- trunk/cluster/src/dialogs.ycp (original) +++ trunk/cluster/src/dialogs.ycp Tue Feb 24 07:36:03 2009 @@ -488,6 +488,7 @@ } if (ret == "start_now") { + Cluster::SaveClusterConfig(); if (!Service::Start("openais")) { Report::Error(Service::Error()); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0