[aadk-commits] qwell: uClinux/trunk r52 - in /uClinux/trunk/uClinux-dist/vendors/Digium/S800...

[aadk-commits at lists.digium.com]

Author: qwell
Date: Fri Nov 10 18:06:12 2006
New Revision: 52

URL: http://svn.digium.com/view/aadk?view=rev&rev=52
Log:
Make zapata.conf act the same way zapata.conf.in acts.

Modified:
    uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc
    uClinux/trunk/uClinux-dist/vendors/Digium/S800I/scripts/save_config

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=52&r1=51&r2=52
==============================================================================
--- uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc (original)
+++ uClinux/trunk/uClinux-dist/vendors/Digium/S800I/rc Fri Nov 10 18:06:12 2006
@@ -82,11 +82,14 @@
 	OPTS="$OPTS opermode=${OPERMODE}"
 fi
 modprobe sx00i ${OPTS}
+cp /etc/zaptel.conf.in /etc/zaptel.conf
+cp /etc/asterisk/zapata.conf.in /etc/asterisk/zapata.conf
+zapscan
 if [ -f /etc/zaptel.conf.override ]; then
 	cp /etc/zaptel.conf.override /etc/zaptel.conf
-else
-	cp /etc/zaptel.conf.in /etc/zaptel.conf
-	zapscan
+fi
+if [ -f /etc/asterisk/zapata.conf.override ]; then
+	cp /etc/asterisk/zapata.conf.override /etc/asterisk/zapata.conf
 fi
 ztcfg
 mount -t ext3 /dev/hda1 /var/lib/asterisk/sounds

Modified: uClinux/trunk/uClinux-dist/vendors/Digium/S800I/scripts/save_config
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/vendors/Digium/S800I/scripts/save_config?view=diff&rev=52&r1=51&r2=52
==============================================================================
--- uClinux/trunk/uClinux-dist/vendors/Digium/S800I/scripts/save_config (original)
+++ uClinux/trunk/uClinux-dist/vendors/Digium/S800I/scripts/save_config Fri Nov 10 18:06:12 2006
@@ -2,8 +2,9 @@
 PID=$$
 ROOT="/"
 SUBDIRS="etc/config etc/asterisk etc/passwd etc/zaptel.conf.* etc/dropbear"
+EXCLUDES="etc/asterisk/zapata.conf"
 cd ${ROOT}
-tar czf /tmp/etc-${PID}.tgz ${SUBDIRS}
+tar czf /tmp/etc-${PID}.tgz ${SUBDIRS} --exclude=${EXCLUDES}
 echo -n "Saving config..."
 dd conv=sync bs=65536 if=/tmp/etc-${PID}.tgz of=/dev/mtd2 count=2 2>/dev/null
 echo "DONE"