qwell: branch aadk r959 - in /branches/aadk: config/ scripts/

[asterisk-gui-commits at lists.digium.com]

Author: qwell
Date: Fri May 18 15:21:41 2007
New Revision: 959

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=959
Log:
Change the NTP Server variable from NTP_LAN to NTP_ADDRESS, since it isn't actually a LAN option.

Don't use NTP Server variable for ntpd address in DHCP.  It's always going to be our LAN IP.

Modified:
    branches/aadk/config/networking.html
    branches/aadk/scripts/networking.sh

Modified: branches/aadk/config/networking.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/networking.html?view=diff&rev=959&r1=958&r2=959
==============================================================================
--- branches/aadk/config/networking.html (original)
+++ branches/aadk/config/networking.html Fri May 18 15:21:41 2007
@@ -26,7 +26,7 @@
 <link href="stylesheets/rico.css" media="all" rel="Stylesheet" type="text/css" />
 <link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
 <script>
-	var nwfields = ["HOSTNAME","DHCP_WAN","IP_WAN","SUBNET_WAN","GATEWAY_WAN","DNS_WAN","DHCP_LAN","IP_LAN","SUBNET_LAN","DNS_LAN","SSHACCESS","TFTP_LAN","LEASE_LAN","NTP_LAN","MAX_LEASE","START_RANGE_LAN","END_RANGE_LAN","DOMAIN_LAN","status","save","cancel"];
+	var nwfields = ["HOSTNAME","NTP_ADDRESS","DHCP_WAN","IP_WAN","SUBNET_WAN","GATEWAY_WAN","DNS_WAN","DHCP_LAN","IP_LAN","SUBNET_LAN","DNS_LAN","SSHACCESS","TFTP_LAN","LEASE_LAN","MAX_LEASE","START_RANGE_LAN","END_RANGE_LAN","DOMAIN_LAN","status","save","cancel"];
 	var widgets = {};
 	var networkingcallbacks = {};
 
@@ -91,7 +91,7 @@
 
 		var cmd3 = "echo \" DNS_LAN=" + _$('DNS_LAN').value + " START_RANGE_LAN=" + _$('START_RANGE_LAN').value + " END_RANGE_LAN=" + _$('END_RANGE_LAN').value + " SSHACCESS=" + ssv + "\" >> " + network_params;
 
-		var cmd4 = "echo \" HOSTNAME=" + _$('HOSTNAME').value + " LEASE_LAN=" + _$('LEASE_LAN').value + " NTP_LAN=" + _$('NTP_LAN').value + " TFTP_LAN=" + _$('TFTP_LAN').value + " DOMAIN_LAN=" + _$('DOMAIN_LAN').value + " MAX_LEASE=" + _$('MAX_LEASE').value + "\" >> " + network_params;
+		var cmd4 = "echo \" HOSTNAME=" + _$('HOSTNAME').value + " LEASE_LAN=" + _$('LEASE_LAN').value + " NTP_ADDRESS=" + _$('NTP_ADDRESS').value + " TFTP_LAN=" + _$('TFTP_LAN').value + " DOMAIN_LAN=" + _$('DOMAIN_LAN').value + " MAX_LEASE=" + _$('MAX_LEASE').value + "\" >> " + network_params;
 
 		var cmd5 = asterisk_guiNetworkSettings;
 
@@ -196,7 +196,7 @@
 				<TD><input type="text" id='HOSTNAME' size=14></TD>
 			</TR>
 			<TR>	<TD>NTP Server</TD>
-				<TD><input type="text" id='NTP_LAN' size=14></TD>
+				<TD><input type="text" id='NTP_ADDRESS' size=14></TD>
 			</TR>
 			<TR>	<TD><B>SSH</B></TD>
 				<TD><input type="checkbox" id='SSHACCESS' value='yes'></TD>

Modified: branches/aadk/scripts/networking.sh
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/scripts/networking.sh?view=diff&rev=959&r1=958&r2=959
==============================================================================
--- branches/aadk/scripts/networking.sh (original)
+++ branches/aadk/scripts/networking.sh Fri May 18 15:21:41 2007
@@ -49,9 +49,9 @@
 hostname ${HOSTNAME}
 
 # Set our time server
-if [ "${NTP_LAN}" != "" ]; then
+if [ "${NTP_ADDRESS}" != "" ]; then
 	killall -9 ntpdate 2> /dev/null
-	ntpdate ${NTP_LAN} &
+	ntpdate ${NTP_ADDRESS} &
 fi
 
 # Handle inetd services.
@@ -118,9 +118,7 @@
 	if [ "${TFTP_LAN}" != "" ]; then
 		echo "opt tftp ${TFTP_LAN}" >> ${DHCPD_CONFIG}
 	fi
-	if [ "${NTP_LAN}" != "" ]; then
-		echo "opt ntpsrv ${NTP_LAN}" >> ${DHCPD_CONFIG}
-	fi
+	echo "opt ntpsrv ${IP_LAN}" >> ${DHCPD_CONFIG}
 	# Stop and restart our dhcp server.
 	killall -9 ${DHCPD_PROCNAME} 2> /dev/null
 	${DHCPD_BIN} &