Author: mzugec Date: Wed Feb 18 18:08:21 2009 New Revision: 55603 URL: http://svn.opensuse.org/viewcvs/yast?rev=55603&view=rev Log: fixed dialogs workflow for s390 (bnc#476490) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/lan/wizards.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=55603&r1=55602&r2=55603&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Feb 18 18:08:21 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=55603&r1=55602&r2=55603&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Feb 18 18:08:21 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 18 18:08:03 CET 2009 - mzugec@suse.cz + +- fixed dialogs workflow for s390 (bnc#476490) +- 2.18.7 + +------------------------------------------------------------------- Wed Feb 18 16:52:43 CET 2009 - kmachalkova@suse.cz - Save complete FQDN into /etc/HOSTNAME if specified by 'hostname=' Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=55603&r1=55602&r2=55603&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Wed Feb 18 18:08:21 2009 @@ -835,10 +835,12 @@ // Allow changing s390 options, except for iucv, where the option // is in the name of the hwcfg file. Haven't figured it out yet. +/* if (Arch::s390 () && drvtype != "iucv") { mb_items = add(mb_items, "S390"); } +*/ wd["ADVANCED_MB", "items"] = maplist (string btn, mb_items, { // TODO helps return [btn, wd[btn, "label"]:btn]; Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=55603&r1=55602&r2=55603&view=diff ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Wed Feb 18 18:08:21 2009 @@ -519,6 +519,9 @@ * @return dialog result */ define any S390Dialog() { + // for virtual devices (no hwinfo) just skip to next dialog (bnc#476490) + if (size(LanItems::getCurrentItem()["hwinfo"]:$[])==0) + return (LanItems::operation==`add) ? `hardware : `next; // already configured device (on hardware layer), skip this dialog if (size(LanItems::Items[LanItems::current, "hwinfo", "dev_name"]:"")>0) return `next; Modified: trunk/network/src/lan/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wizards.ycp?rev=55603&r1=55602&r2=55603&view=diff ============================================================================== --- trunk/network/src/lan/wizards.ycp (original) +++ trunk/network/src/lan/wizards.ycp Wed Feb 18 18:08:21 2009 @@ -152,13 +152,11 @@ ]; string ws_start = "address"; - if(action == "add") ws_start = "hardware"; - - /* All S/390 network devices */ -// if(Arch::s390 () && LanItems::operation == `add) { - if(Arch::s390 () ) { - ws_start = "s390"; - } + // for s390 start with S390Dialog() - there are another conditions + // for new devices start with HardwareDialog() + if(Arch::s390 () ) ws_start = "s390"; + else if(action == "add") ws_start = "hardware"; + y2milestone("ws_start %1", ws_start); map sequence = $[ "ws_start" : ws_start, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org