[aadk-commits] dbailey: uClinux/trunk r336 - in /uClinux/trunk/uClinux-dist: defaults/etc/as...

[aadk-commits at lists.digium.com]

Author: dbailey
Date: Mon Apr 16 09:15:17 2007
New Revision: 336

URL: http://svn.digium.com/view/aadk?view=rev&rev=336
Log:
Eliminate explicit references to aadk in the uImage

Modified:
    uClinux/trunk/uClinux-dist/defaults/etc/asterisk/networking.conf
    uClinux/trunk/uClinux-dist/user/busybox/miscutils/makeiplist.c
    uClinux/trunk/uClinux-dist/user/ssmtp/ssmtp.conf
    uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc

Modified: uClinux/trunk/uClinux-dist/defaults/etc/asterisk/networking.conf
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/defaults/etc/asterisk/networking.conf?view=diff&rev=336&r1=335&r2=336
==============================================================================
--- uClinux/trunk/uClinux-dist/defaults/etc/asterisk/networking.conf (original)
+++ uClinux/trunk/uClinux-dist/defaults/etc/asterisk/networking.conf Mon Apr 16 09:15:17 2007
@@ -6,13 +6,13 @@
 ;!
 
 [general]
-HOSTNAME = aadk
 ESSID = 
 WEPKEY =
 OPERMODE = FCC
 SUBBLOCK = 192.168.69
 ALTSUBBLOCK = 10.69.69
 NETMASK = 255.255.255.0
-DHCPSTARTUNIT = 50
+DHCPSTARTUNIT = 51
 DHCPCOUNT = 100
 SSHACCESS = yes
+HOSTNAME = asteriskpbx

Modified: uClinux/trunk/uClinux-dist/user/busybox/miscutils/makeiplist.c
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/busybox/miscutils/makeiplist.c?view=diff&rev=336&r1=335&r2=336
==============================================================================
--- uClinux/trunk/uClinux-dist/user/busybox/miscutils/makeiplist.c (original)
+++ uClinux/trunk/uClinux-dist/user/busybox/miscutils/makeiplist.c Mon Apr 16 09:15:17 2007
@@ -23,15 +23,14 @@
 		exit(1);
 	}
 	printf("Building DHCP IP address List\n");
-	f = fopen("/etc/hosts", "w");
+	f = fopen("/etc/hosts", "a");
 	if (!f)
 		exit(1);
-	fprintf(f, "%s aadk.aadk router.aadk aadk\n", argv[1]);
 	inet_aton(argv[2], &ina);
 	count = atoi(argv[3]);
-	for (x=0;x<count;x++) {
+	for (x = 0; x < count; x++) {
+		fprintf(f, "%s host-%03d\n", inet_ntoa(ina), x + 1);
 		ina.s_addr = htonl(ntohl(ina.s_addr) + 1);
-		fprintf(f, "%s host-%03d.aadk\n", inet_ntoa(ina), x + 1);
 	}
 	fclose(f);
 	f = fopen(DHCP_CONFIG, "w");
@@ -45,7 +44,6 @@
 	fprintf(f, "remaining yes\n");
 	fprintf(f, "opt dns %s\n", argv[1]);
 	fprintf(f, "opt subnet 255.255.255.0\n");
-	fprintf(f, "opt domain aadk\n");
 	fprintf(f, "opt lease 8640000\n");
 	fprintf(f, "opt router %s\n", argv[1]);
 	fclose(f);

Modified: uClinux/trunk/uClinux-dist/user/ssmtp/ssmtp.conf
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/ssmtp/ssmtp.conf?view=diff&rev=336&r1=335&r2=336
==============================================================================
--- uClinux/trunk/uClinux-dist/user/ssmtp/ssmtp.conf (original)
+++ uClinux/trunk/uClinux-dist/user/ssmtp/ssmtp.conf Mon Apr 16 09:15:17 2007
@@ -22,7 +22,7 @@
 rewriteDomain=
 
 # The full hostname
-hostname=aadk
+#hostname=yourhostname
 
 # Set this to never rewrite the "From:" line (unless not given) and to
 # use that address in the "from line" of the envelope.

Modified: uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc?view=diff&rev=336&r1=335&r2=336
==============================================================================
--- uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc (original)
+++ uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc Mon Apr 16 09:15:17 2007
@@ -110,6 +110,7 @@
 
 ifconfig lo 127.0.0.1
 ifconfig eth1 ${LOCALIP}
+echo ${LOCALIP} ${HOSTNAME} > /etc/hosts
 makeiplist ${LOCALIP} ${DHCPSTART} ${DHCPCOUNT}
 if [ "$SSHACCESS" = "yes" ]; then
 	inetd &