Author: mzugec Date: Fri Jan 16 16:56:12 2009 New Revision: 54715 URL: http://svn.opensuse.org/viewcvs/yast?rev=54715&view=rev Log: run isdn only when needed (bnc#104590) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/ISDN.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=54715&r1=54714&r2=54715&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Jan 16 16:56:12 2009 @@ -1 +1 @@ -2.17.64 +2.18.0 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=54715&r1=54714&r2=54715&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jan 16 16:56:12 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 16 16:50:13 CET 2009 - mzugec@suse.cz + +- run isdn only when needed (bnc#104590) +- 2.18.0 + +------------------------------------------------------------------- Fri Jan 16 11:47:51 CET 2009 - mzugec@suse.cz - ISDN: use UNIQUE to match device with configuration (bnc#407683) Modified: trunk/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/ISDN.ycp?rev=54715&r1=54714&r2=54715&view=diff ============================================================================== --- trunk/network/src/modules/ISDN.ycp (original) +++ trunk/network/src/modules/ISDN.ycp Fri Jan 16 16:56:12 2009 @@ -354,6 +354,7 @@ y2debug("Packages returns %1", retp); } + boolean haveISDNDev = ($[] != Devices["contr"]:$[]); if(!(modified_hw || modified_if || Provider::Modified("isdn"))) return true; y2milestone("Writing configuration"); @@ -525,8 +526,15 @@ if(Abort()) return false; // last step in writing current ISDN setup - cmd = sformat("/sbin/insserv isdn"); // #104590 - SCR::Execute(.target.bash, cmd); + if(haveISDNDev) { + cmd = sformat("/sbin/insserv isdn"); // #104590 + SCR::Execute(.target.bash, cmd); + } else { + cmd = sformat("/sbin/insserv -r capisuite"); + SCR::Execute(.target.bash, cmd); + cmd = sformat("/sbin/insserv -r isdn"); + SCR::Execute(.target.bash, cmd); + } ProgressNextStage(_("Finished")); sleep(sl); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org