Author: mzugec Date: Tue Oct 26 16:34:13 2010 New Revision: 62688 URL: http://svn.opensuse.org/viewcvs/yast?rev=62688&view=rev Log: allow empty IP/netmask for bootproto=static Modified: trunk/network/src/lan/address.ycp Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=62688&r1=62687&r2=62688&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Tue Oct 26 16:34:13 2010 @@ -467,14 +467,14 @@ if (UI::QueryWidget(`bootproto, `CurrentButton) == `static) { string ipa = (string) UI::QueryWidget (`ipaddr, `Value); - if (! IP::Check(ipa)){ + if (ipa!="" && !IP::Check(ipa)){ Popup::Error(_("No valid IP address.")); UI::SetFocus(`ipaddr); return false; } string mask=(string) UI::QueryWidget (`netmask, `Value); - if(!validPrefixOrNetmask(ipa, mask)){ + if((ipa!="" && mask!="") && !validPrefixOrNetmask(ipa, mask)){ Popup::Error(_("No valid netmask or prefix length.")); UI::SetFocus(`netmask); return false; @@ -848,9 +848,12 @@ "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, "TUNNEL_SET_GROUP" : LanItems::tunnel_set_group ]; - } else { + } +/* + else { if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; } +*/ // #65524 if (LanItems::operation == `add && force_static_ip) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org