Author: mzugec Date: Fri Jun 26 13:33:45 2009 New Revision: 57763 URL: http://svn.opensuse.org/viewcvs/yast?rev=57763&view=rev Log: removed broadcast option from dhcp settings (bnc#513146) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/dhcp.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=57763&r1=57762&r2=57763&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Jun 26 13:33:45 2009 @@ -1 +1 @@ -2.18.37 +2.18.38 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=57763&r1=57762&r2=57763&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jun 26 13:33:45 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 26 13:24:15 CEST 2009 - mzugec@suse.cz + +- removed broadcast option from dhcp settings (bnc#513146) +- 2.18.38 + +------------------------------------------------------------------- Thu Jun 25 15:54:01 CEST 2009 - mzugec@suse.cz - for lcs and ctc offer only 2 CHAN_IDS (bnc#515492) Modified: trunk/network/src/lan/dhcp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/dhcp.ycp?rev=57763&r1=57762&r2=57763&view=diff ============================================================================== --- trunk/network/src/lan/dhcp.ycp (original) +++ trunk/network/src/lan/dhcp.ycp Fri Jun 26 13:33:45 2009 @@ -21,12 +21,15 @@ void initDhclientOptions(string key) { +/* boolean dhclient_broadcast = false; if(issubstring(NetworkConfig::DHCP["DHCLIENT_ADDITIONAL_OPTIONS"]:"", "-B")) dhclient_broadcast = true; + UI::ChangeWidget(`id(`broadcast), `Value, dhclient_broadcast); +*/ UI::ChangeWidget(`id(`clientid), `Value, NetworkConfig::DHCP["DHCLIENT_CLIENT_ID"]:""); UI::ChangeWidget(`id(`hostname), `Value, NetworkConfig::DHCP["DHCLIENT_HOSTNAME_OPTION"]:""); UI::ChangeWidget(`id(`no_defaultroute), `Value, NetworkConfig::DHCP["DHCLIENT_SET_DEFAULT_ROUTE"]:true); @@ -40,18 +43,20 @@ UI::QueryWidget(`id(`no_defaultroute), `Value) == true; NetworkConfig::DHCP["DHCLIENT_CLIENT_ID"] = UI::QueryWidget(`id(`clientid), `Value); NetworkConfig::DHCP["DHCLIENT_HOSTNAME_OPTION"] = UI::QueryWidget(`id(`hostname), `Value); +/* boolean dhclient_broadcast = UI::QueryWidget(`id(`broadcast), `Value) == true; - /* DHCP data */ string options = NetworkConfig::DHCP["DHCLIENT_ADDITIONAL_OPTIONS"]:""; if(options == nil) options = ""; if(dhclient_broadcast && !issubstring(options, "-B")) { NetworkConfig::DHCP["DHCLIENT_ADDITIONAL_OPTIONS"] = options + " -B"; } - else if(!dhclient_broadcast && issubstring(options, "-B")) { + else + if(!dhclient_broadcast && issubstring(options, "-B")) { NetworkConfig::DHCP["DHCLIENT_ADDITIONAL_OPTIONS"] = regexpsub(options, "(.*)-B(.*)", "\\1\\2"); } +*/ } @@ -60,13 +65,13 @@ /* Frame label */ `Frame(_("DHCP Client Options"), `VBox( /* CheckBox label */ - `Left(`CheckBox(`id(`broadcast), _("Request Broad&cast Response"))), - `VSpacing(0.49), + // `Left(`CheckBox(`id(`broadcast), _("Request Broad&cast Response"))), +// `VSpacing(0.49), /* TextEntry label */ - `Left(`TextEntry(`id(`clientid), _("DHCP Client &Identifier"))), + `Left(`InputField(`id(`clientid), `opt(`hstretch), _("DHCP Client &Identifier"))), `VSpacing(0.49), /* TextEntry label */ - `Left(`TextEntry(`id(`hostname), _("&Hostname to Send"))), + `Left(`InputField(`id(`hostname), `opt(`hstretch), _("&Hostname to Send"))), `VSpacing(0.49), `Left(`HBox(`CheckBox(`id(`no_defaultroute), _("Change Default Route via DHCP")))) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org