espiceland: branch 2.0 r5107 - /branches/2.0/config/js/

[SVN commits to the Asterisk-GUI project]

Author: espiceland
Date: Fri Oct 22 11:40:55 2010
New Revision: 5107

URL: http://svnview.digium.com/svn/asterisk-gui?view=rev&rev=5107
Log:
Use /etc/modprobe.d/dahdi.conf to avoid overwriting non-Asterisk configurations in /etc/modprobe.conf.

Modified:
    branches/2.0/config/js/hardware.js
    branches/2.0/config/js/hardware_dahdi.js

Modified: branches/2.0/config/js/hardware.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/hardware.js?view=diff&rev=5107&r1=5106&r2=5107
==============================================================================
--- branches/2.0/config/js/hardware.js (original)
+++ branches/2.0/config/js/hardware.js Fri Oct 22 11:40:55 2010
@@ -729,8 +729,8 @@
 		u.callActions();
 		u.clearActions();
 	
-		ASTGUI.dialog.waitWhile('updating modprobe.conf ...');
-		var cmd1 = "cp /etc/asterisk/modprobe_default /etc/modprobe.conf";
+		ASTGUI.dialog.waitWhile('updating modprobe configuration ...');
+		var cmd1 = "cp /etc/asterisk/modprobe_default /etc/modprobe.d/dahdi.conf";
 		var params = "options " + ASTGUI.getFieldValue('zap_moduleName') ;
 
 		if( _$('enable_disable_checkbox_opermode').checked ){
@@ -780,7 +780,7 @@
 			}
 		}
 	
-		var cmd2 = "echo \"" + params + "\" >> /etc/modprobe.conf ";
+		var cmd2 = "echo \"" + params + "\" >> /etc/modprobe.d/dahdi.conf ";
 	
 		var update_usersConf = function(){
 			// update MWI settings in users.conf

Modified: branches/2.0/config/js/hardware_dahdi.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/hardware_dahdi.js?view=diff&rev=5107&r1=5106&r2=5107
==============================================================================
--- branches/2.0/config/js/hardware_dahdi.js (original)
+++ branches/2.0/config/js/hardware_dahdi.js Fri Oct 22 11:40:55 2010
@@ -848,8 +848,8 @@
 		u.callActions();
 		u.clearActions();
 	
-		ASTGUI.dialog.waitWhile('updating modprobe.conf ...');
-		var cmd1 = "cp /etc/asterisk/modprobe_default /etc/modprobe.conf";
+		ASTGUI.dialog.waitWhile('updating modprobe configuration ...');
+		var cmd1 = "cp /etc/asterisk/modprobe_default /etc/modprobe.d/dahdi.conf";
 		var params = "options " + $('#zap_moduleName').val();
 
 		if( $('#enable_disable_checkbox_opermode:checked').val() !== null ){
@@ -906,7 +906,7 @@
 		h = ASTGUI.getFieldValue('vpmnlpmaxsupp');
 			if(h){ params += " vpmnlpmaxsupp=" + h; }
 	
-		var cmd2 = "echo \"" + params + "\" >> /etc/modprobe.conf ";
+		var cmd2 = "echo \"" + params + "\" >> /etc/modprobe.d/dahdi.conf ";
 	
 		var update_usersConf = function(){
 			// update MWI settings in users.conf