Author: mzugec Date: Fri Oct 26 12:39:49 2007 New Revision: 41587 URL: http://svn.opensuse.org/viewcvs/yast?rev=41587&view=rev Log: when select dhcp don't remove static default GW for hotplug (usb/pcmci) devices(#307102) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/lan/wizards.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/routines/hardware.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41587&r1=41586&r2=41587&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Oct 26 12:39:49 2007 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=41587&r1=41586&r2=41587&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Oct 26 12:39:49 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 26 12:38:52 CEST 2007 - mzugec@suse.de + +- when select dhcp don't remove static default GW for hotplug + (usb/pcmci) devices(#307102) +- 2.16.4 + +------------------------------------------------------------------- Wed Oct 10 18:19:37 CEST 2007 - mzugec@suse.cz - fixed displayed name for network device (#330994) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=41587&r1=41586&r2=41587&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Fri Oct 26 12:39:49 2007 @@ -926,7 +926,8 @@ LanItems::netmask = ""; LanItems::remoteip = ""; // fixed bug #73739 - if dhcp is used, dont set default gw statically - Routing::RemoveDefaultGw(); + // don't delete default GW for usb/pcmci devices (#307102) + if (!LanItems::isCurrentHotplug()) Routing::RemoveDefaultGw(); } } Modified: trunk/network/src/lan/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wizards.ycp?rev=41587&r1=41586&r2=41587&view=diff ============================================================================== --- trunk/network/src/lan/wizards.ycp (original) +++ trunk/network/src/lan/wizards.ycp Fri Oct 26 12:39:49 2007 @@ -155,7 +155,7 @@ if(action == "add") ws_start = "hardware"; /* All S/390 network devices */ - if(Arch::s390 () && LanItems::operation == `add && LanItems::unique != "") { + if(Arch::s390 () && LanItems::operation == `add) { ws_start = "s390"; } Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=41587&r1=41586&r2=41587&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Fri Oct 26 12:39:49 2007 @@ -40,7 +40,7 @@ global string description = ""; //unique - only for backward compatibility -global string unique = ""; +//global string unique = ""; global string type = ""; global string device = ""; @@ -432,6 +432,15 @@ return Items[current]:$[]; } +/* + * Is current device hotplug or not? I.e. is connected via usb/pcmci? + */ +global boolean isCurrentHotplug(){ + string hotplugtype = getCurrentItem()["hwinfo", "hotplug"]:""; + if (hotplugtype == "usb" || hotplugtype == "pcmci") return true; + else return false; +} + global boolean IsItemConfigured(){ boolean ret = false; if (size(getCurrentItem()["ifcfg"]:"")>0) ret = true; Modified: trunk/network/src/routines/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/hardware.ycp?rev=41587&r1=41586&r2=41587&view=diff ============================================================================== --- trunk/network/src/routines/hardware.ycp (original) +++ trunk/network/src/routines/hardware.ycp Fri Oct 26 12:39:49 2007 @@ -51,7 +51,7 @@ type = sel["type"]:"eth"; hotplug = sel["hotplug"]:""; - unique = sel["udi"]:""; +// unique = sel["udi"]:""; Requires = sel["requires"]:[]; // #44977: Requires now contain the appropriate kernel packages // but they are handled differently due to multiple kernel flavors -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org