Author: mzugec Date: Tue Aug 14 23:21:48 2007 New Revision: 40271 URL: http://svn.opensuse.org/viewcvs/yast?rev=40271&view=rev Log: save network configuration also when smpppd/kinternet not available for USERCONTROL enabled devices (#299033) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/DSL.ycp trunk/network/src/modules/ISDN.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/Modem.ycp trunk/network/src/routines/runtime.ycp trunk/network/testsuite/tests/runtime.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Aug 14 23:21:48 2007 @@ -1 +1 @@ -2.15.60 +2.15.61 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Aug 14 23:21:48 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 14 23:06:13 CEST 2007 - mzugec@suse.de + +- save network configuration also when smpppd/kinternet not available + for USERCONTROL enabled devices (#299033) +- 2.15.61 + +------------------------------------------------------------------- Mon Aug 13 18:38:29 CEST 2007 - mzugec@suse.cz - autoyast support for aliases (F302300) Modified: trunk/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DSL.ycp?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/src/modules/DSL.ycp (original) +++ trunk/network/src/modules/DSL.ycp Tue Aug 14 23:21:48 2007 @@ -295,7 +295,7 @@ if(Abort()) return false; /* Progress step 6/7 */ ProgressNextStage(_("Setting up smpppd(8)...")); - SetupSMPPPD(); + SetupSMPPPD(true); sleep(sl); if(Abort()) return false; Modified: trunk/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/ISDN.ycp?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/src/modules/ISDN.ycp (original) +++ trunk/network/src/modules/ISDN.ycp Tue Aug 14 23:21:48 2007 @@ -499,7 +499,7 @@ if(Abort()) return false; // step 11 in writing current ISDN setup ProgressNextStage(_("Setting up smpppd(8)...")); - SetupSMPPPD(); + SetupSMPPPD(true); sleep(sl); if(Abort()) return false; Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue Aug 14 23:21:48 2007 @@ -424,13 +424,13 @@ if(!write_only) RunSuSEconfig(); sleep(sl); - if (!NetworkService::IsManaged() && (boolean) SCR::Read(.init.scripts.exists, "smpppd") && !write_only && needKInternet()) + if (!NetworkService::IsManaged() /*&& (boolean) SCR::Read(.init.scripts.exists, "smpppd")*/ && !write_only && needKInternet()) { if(Abort()) return false; /* Progress step 11 */ ProgressNextStage(_("Setting up smpppd(8)...")); // takes care of autoinst by itself - SetupSMPPPD(); + SetupSMPPPD(false); sleep(sl); if(Abort()) return false; @@ -1079,10 +1079,13 @@ */ global list<string> Packages () { list<string> pkgs = []; + // #299033 - don't install smpppd now, do it later (with some tests) +/* if (NetworkDevices::Locate ("USERCONTROL", "yes") != []) { if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd"); } +*/ if (NetworkDevices::Locate ("STARTMODE", "ifplugd") != []) { if (!PackageSystem::Installed("ifplugd")) pkgs = add (pkgs, "ifplugd"); Modified: trunk/network/src/modules/Modem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Modem.ycp?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/src/modules/Modem.ycp (original) +++ trunk/network/src/modules/Modem.ycp Tue Aug 14 23:21:48 2007 @@ -261,7 +261,7 @@ if(Abort()) return false; /* Progress step 5/6 */ ProgressNextStage(_("Setting up smpppd(8)...")); - SetupSMPPPD(); + SetupSMPPPD(true); sleep(sl); if(Abort()) return false; Modified: trunk/network/src/routines/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/runtime.ycp?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/src/routines/runtime.ycp (original) +++ trunk/network/src/routines/runtime.ycp Tue Aug 14 23:21:48 2007 @@ -16,6 +16,7 @@ import "NetworkDevices"; import "Package"; import "Service"; +import "PackageSystem"; textdomain "network"; @@ -82,7 +83,7 @@ * Setup smpppd(8) * @return true if success */ -define boolean SetupSMPPPD() { +define boolean SetupSMPPPD(boolean install_force) { boolean ret = true; /* Stop and disable */ if (!HaveDialupLikeInterfaces ()) { @@ -91,11 +92,19 @@ } /* Start and enable */ else { - Package::InstallAllMsg(["smpppd", "kinternet"], + if (!PackageSystem::Installed("smpppd") || !PackageSystem::Installed("kinternet")) + { + string message = // notification about package needed 1/2 _("<p>Because Device Control for Non-root User has been enabled, the <b>%1</b> packages must be installed.</p>") + // notification about package needed 2/2 - _("<p>Do you want to install it now?</p>")); + _("<p>Do you want to install it now?</p>"); + + // (#299033) - if not forced, user can continue also without packages + if (!install_force) PackageSystem::CheckAndInstallPackages(["smpppd", "kinternet"]); + else + Package::InstallAllMsg(["smpppd", "kinternet"], message); + ret = Service::Enable("smpppd") && ret; @@ -106,6 +115,7 @@ else ret = Service::Start("smpppd") && ret; } + } } return ret; Modified: trunk/network/testsuite/tests/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/runtime.ycp?rev=40271&r1=40270&r2=40271&view=diff ============================================================================== --- trunk/network/testsuite/tests/runtime.ycp (original) +++ trunk/network/testsuite/tests/runtime.ycp Tue Aug 14 23:21:48 2007 @@ -80,7 +80,7 @@ TEST(``(RunKInternet()), [READ,$[],EXEC1], nil); DUMP("SetupSMPPPD"); -TEST(``(SetupSMPPPD()), [READ,$[],EXEC0], nil); -TEST(``(SetupSMPPPD()), [READ,$[],EXEC1], nil); +TEST(``(SetupSMPPPD(true)), [READ,$[],EXEC0], nil); +TEST(``(SetupSMPPPD(false)), [READ,$[],EXEC1], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org