Author: mzugec Date: Thu Mar 26 12:38:22 2009 New Revision: 56421 URL: http://svn.opensuse.org/viewcvs/yast?rev=56421&view=rev Log: tun/tap device - don't remove default gw (bnc#483233) Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/VERSION?rev=56421&r1=56420&r2=56421&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/network/VERSION Thu Mar 26 12:38:22 2009 @@ -1 +1 @@ -2.17.86 +2.17.87 Modified: branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes?rev=56421&r1=56420&r2=56421&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes Thu Mar 26 12:38:22 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 12:37:55 CET 2009 - mzugec@suse.cz + +- tun/tap device - don't remove default gw (bnc#483233) +- 2.17.87 + +------------------------------------------------------------------- Thu Mar 26 10:53:19 CET 2009 - mzugec@suse.cz - don't allow to use networkmanager with bridged proposal (bnc#487419) Modified: branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp?rev=56421&r1=56420&r2=56421&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp Thu Mar 26 12:38:22 2009 @@ -757,6 +757,13 @@ "IFCFGTYPE": LanItems::type, "IFCFGID": LanItems::device, ]; + + string drvtype = DriverType (settings["IFCFGTYPE"]:""); + + boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; + // TODO: dynamic for dummy. or add dummy from outside? + boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; + if (contains(["tun", "tap"], LanItems::type)) { settings = $[ @@ -767,16 +774,10 @@ "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, "TUNNEL_SET_GROUP" : LanItems::tunnel_set_group ]; + } else { + if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; } - string drvtype = DriverType (settings["IFCFGTYPE"]:""); - - boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; - // TODO: dynamic for dummy. or add dummy from outside? - boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; - - 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