Author: mzugec Date: Mon Jul 26 14:29:49 2010 New Revision: 62297 URL: http://svn.opensuse.org/viewcvs/yast?rev=62297&view=rev Log: L3: fixed cmd-line support (bnc#624246) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/clients/isdn.ycp branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan.ycp branches/SuSE-Code-11-SP1-Branch/network/src/dsl/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=62297&r1=62296&r2=62297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Jul 26 14:29:49 2010 @@ -1 +1 @@ -2.17.138 +2.17.139 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=62297&r1=62296&r2=62297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Jul 26 14:29:49 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 26 14:28:35 CEST 2010 - mzugec@suse.de + +- L3: fixed cmd-line support (bnc#624246) +- 2.17.139 + +------------------------------------------------------------------- Tue Jun 22 16:09:27 CEST 2010 - mzugec@suse.cz - L3: AY Layer2 support (bnc#573607) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/clients/isdn.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/clients/isdn.ycp?rev=62297&r1=62296&r2=62297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/clients/isdn.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/clients/isdn.ycp Mon Jul 26 14:29:49 2010 @@ -21,7 +21,7 @@ import "Mode"; import "CommandLine"; - include "network/isdn/wizards.ycp"; +include "network/isdn/wizards.ycp"; /* is this proposal or not? */ Modified: branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan.ycp?rev=62297&r1=62296&r2=62297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan.ycp Mon Jul 26 14:29:49 2010 @@ -30,8 +30,6 @@ include "network/lan/cmdline.ycp"; include "network/lan/wizards.ycp"; -// return LanSequence(); - /** * Command line definition */ @@ -40,7 +38,7 @@ "help" : _("Network Card Configuration"), "id" : "lan", "guihandler": LanSequence, - "initialize": Lan::ReadWithCache, + "initialize": Lan::ReadWithCacheNoGUI, "finish" : Lan::Write, "actions" : $[ "list" : $[ Modified: branches/SuSE-Code-11-SP1-Branch/network/src/dsl/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/dsl/dialogs.ycp?rev=62297&r1=62296&r2=62297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/dsl/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/dsl/dialogs.ycp Mon Jul 26 14:29:49 2010 @@ -27,7 +27,7 @@ include "network/runtime.ycp"; include "network/routines.ycp"; include "network/widgets.ycp"; -include "network/installation/dialogs.ycp"; +//include "network/installation/dialogs.ycp"; /** * DSL device dialog Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp?rev=62297&r1=62296&r2=62297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp Mon Jul 26 14:29:49 2010 @@ -22,7 +22,6 @@ import "Wizard"; import "Popup"; import "Label"; -import "Product"; import "Package"; import "TablePopup"; import "CWMTab"; @@ -125,10 +124,10 @@ if (fw != ""){ if ((!Package::Installed(fw) && !Package::Available(fw))){ Popup::Message(sformat(_("Firmware is needed. Install it from -%1 Add-On CD. +Add-On CD. First add the Add-On CD to your YaST software repositories then return to this configuration dialog. -"), Product::name)); +"))); return false; } else if (!contains(LanItems::Requires, fw)) LanItems::Requires = add(LanItems::Requires, fw); Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp?rev=62297&r1=62296&r2=62297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Mon Jul 26 14:29:49 2010 @@ -50,6 +50,9 @@ /*-------------*/ /* GLOBAL DATA */ +// gui or cli mode +boolean gui=true; + boolean write_only = false; /** @@ -232,7 +235,7 @@ integer sl = 0; /* 1000; /* TESTING */ sleep(sl); - Progress::New(caption, " ", steps, [ + if (gui) Progress::New(caption, " ", steps, [ /* Progress stage 1/9 */ _("Detect network devices"), /* Progress stage 2/9 */ @@ -258,10 +261,9 @@ // check the environment // if(!Confirm::MustBeRoot()) return false; - if(Abort()) return false; /* Progress step 1/9 */ - ProgressNextStage(_("Detecting for ndiswrapper...")); + if (gui) ProgressNextStage(_("Detecting for ndiswrapper...")); // modprobe ndiswrapper before hwinfo when needed (#343893) if (!Mode::autoinst() && PackageSystem::Installed("ndiswrapper")){ y2milestone("ndiswrapper: installed"); @@ -283,7 +285,7 @@ if(Abort()) return false; /* Progress step 2/9 */ - ProgressNextStage(_("Detecting network devices...")); + if (gui) ProgressNextStage(_("Detecting network devices...")); // FIXME: MOD // ReadModules(NetworkInterfaces::CardRegex["netcard"]:""); // Dont read hardware data in config mode if(!Mode::config ()) { @@ -293,13 +295,13 @@ if(Abort()) return false; /* Progress step 3/9 - multiple devices may be present, really plural*/ - ProgressNextStage(_("Reading device configuration...")); + if (gui) ProgressNextStage(_("Reading device configuration...")); LanItems::Read(); sleep(sl); if(Abort()) return false; /* Progress step 4/9 */ - ProgressNextStage(_("Reading network configuration...")); + if (gui) ProgressNextStage(_("Reading network configuration...")); NetworkConfig::Read(); readIPv6(); @@ -308,47 +310,47 @@ if(Abort()) return false; /* Progress step 5/9 */ - ProgressNextStage(_("Reading firewall settings...")); + if (gui) ProgressNextStage(_("Reading firewall settings...")); boolean orig = Progress::set (false); SuSEFirewall4Network::Read (); - Progress::set (orig); + if (gui) Progress::set (orig); sleep(sl); if(Abort()) return false; /* Progress step 6/9 */ - ProgressNextStage(_("Reading hostname and DNS configuration...")); + if (gui) ProgressNextStage(_("Reading hostname and DNS configuration...")); DNS::Read(); Host::Read(); sleep(sl); if(Abort()) return false; /* Progress step 7/9 */ - ProgressNextStage(_("Reading installation information...")); + if (gui) ProgressNextStage(_("Reading installation information...")); // ReadInstallInf(); sleep(sl); if(Abort()) return false; /* Progress step 8/9 */ - ProgressNextStage(_("Reading routing configuration...")); + if (gui) ProgressNextStage(_("Reading routing configuration...")); Routing::Read(); sleep(sl); if(Abort()) return false; /* Progress step 9/9 */ - ProgressNextStage(_("Detecting current status...")); + if (gui) ProgressNextStage(_("Detecting current status...")); NetworkService::Read (); sleep(sl); if(Abort()) return false; /* Final progress step */ - ProgressNextStage(_("Finished")); + if (gui) ProgressNextStage(_("Finished")); sleep(sl); if(Abort()) return false; LanItems::modified = false; initialized = true; - Progress::Finish(); + if (gui) Progress::Finish(); return true; } @@ -361,6 +363,11 @@ return Read (`cache); } +global boolean ReadWithCacheNoGUI () { + gui=false; + return ReadWithCache(); +} + global void SetIPv6(boolean status){ if(ipv6 != status) { ipv6=status; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org