Author: mzugec Date: Mon Dec 3 18:54:28 2007 New Revision: 42633 URL: http://svn.opensuse.org/viewcvs/yast?rev=42633&view=rev Log: modprobe ndiswrapper before hwinfo when needed (#343893) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=42633&r1=42632&r2=42633&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Dec 3 18:54:28 2007 @@ -1 +1 @@ -2.16.12 +2.16.13 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=42633&r1=42632&r2=42633&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Dec 3 18:54:28 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 3 18:54:09 CET 2007 - mzugec@suse.cz + +- modprobe ndiswrapper before hwinfo when needed (#343893) +- 2.16.13 + +------------------------------------------------------------------- Mon Dec 3 13:14:15 CET 2007 - mzugec@suse.cz - warning for NM and password (#225793) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=42633&r1=42632&r2=42633&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Dec 3 18:54:28 2007 @@ -38,6 +38,7 @@ import "FileUtils"; import "PackageSystem"; import "LanItems"; +import "ModuleLoading"; include "network/complex.ycp"; include "network/runtime.ycp"; @@ -199,14 +200,22 @@ if(!Confirm::MustBeRoot()) return false; + if(Abort()) return false; /* Progress step 1/9 */ - ProgressNextStage(_("Detecting network devices...")); - // if(!Arch::s390 ()) /* FIXME: Temporary hack until the detection is functional */ - - // Dont read hardware data in config mode - if(!Mode::config ()) { - if(!NetHwDetection::running) NetHwDetection::Start(); - LanItems::ReadHw(); + ProgressNextStage(_("Detecting for ndiswrapper...")); + // modprobe ndiswrapper before hwinfo when needed (#343893) + if (!Mode::autoinst() && PackageSystem::Installed("ndiswrapper")){ + y2milestone("ndiswrapper: installed"); + if (size((list<string>)SCR::Read(.target.dir, "/etc/ndiswrapper"))>0){ + y2milestone("ndiswrapper: configuration found"); + if ((integer)SCR::Execute(.target.bash, "lsmod |grep -q ndiswrapper")!=0 + && Popup::YesNo(_("There is ndiswrapper configuration detected +but kernel module wasn't modprobed. +Should I modprobe ndiswrapper?"))) { + if (ModuleLoading::Load("ndiswrapper", "", "", "", false, true)==`fail) Popup::Error(_("ndiswrapper kernel module wasn't loaded. +Check configuration manually.")); + } + } } /* ReadHardware(""); /* TESTING */ @@ -214,9 +223,13 @@ if(Abort()) return false; /* Progress step 2/9 */ - ProgressNextStage(_("Reading /etc/modprobe.conf...")); + ProgressNextStage(_("Detecting network devices...")); // FIXME: MOD // ReadModules(NetworkDevices::CardRegex["netcard"]:""); - LanItems::ReadNetworkModules(); + // Dont read hardware data in config mode + if(!Mode::config ()) { + if(!NetHwDetection::running) NetHwDetection::Start(); + LanItems::ReadHw(); + } sleep(sl); if(Abort()) return false; Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=42633&r1=42632&r2=42633&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Mon Dec 3 18:54:28 2007 @@ -238,10 +238,6 @@ }); } -// temporary used for reading configurations without hwinfo -global void ReadNetworkModules(){ -} - // get list of all configurations for "netcard" macro in NetworkDevices module list<string> getNetworkDevices(){ list<string> confs=[]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org