[asterisk-commits] kpfleming: branch 1.6.1 r191957 - in /branches/1.6.1: ./ configs/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon May  4 05:00:04 2009
New Revision: 191957

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=191957
Log:
Merged revisions 191955 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r191955 | kpfleming | 2009-05-04 11:57:36 +0200 (Mon, 04 May 2009) | 8 lines
  
  Ensure that by default only one console channel driver is loaded
  
  This configuration file was changed to ensure that only one console channel driver
  (chan_oss) is loaded by default, but the change would only work if chan_console
  was not built. Now it will work as expected; if chan_alsa or chan_console are built
  and installed, they will not be loaded unless explicity requested.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/modules.conf.sample

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configs/modules.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/configs/modules.conf.sample?view=diff&rev=191957&r1=191956&r2=191957
==============================================================================
--- branches/1.6.1/configs/modules.conf.sample (original)
+++ branches/1.6.1/configs/modules.conf.sample Mon May  4 05:00:04 2009
@@ -36,7 +36,7 @@
 ;
 noload => chan_alsa.so
 ;noload => chan_oss.so
-;noload => chan_console.so
+noload => chan_console.so
 ;
 ;
 ; Only load one timing interface.  If DAHDI is available, use that as it will