[svn] commit: r1483 - in /trunk/src/bin/loadzone: Makefile.am b10-loadzone.py.in b10-loadzone.xml

[BIND 10 source code commits]

Author: jreed
Date: Wed Mar 17 17:21:10 2010
New Revision: 1483

Log:
Use $localstatedir for the location of the zone.sqlite3.
(This will be more advanced later...)

Modified:
    trunk/src/bin/loadzone/Makefile.am
    trunk/src/bin/loadzone/b10-loadzone.py.in
    trunk/src/bin/loadzone/b10-loadzone.xml

Modified: trunk/src/bin/loadzone/Makefile.am
==============================================================================
--- trunk/src/bin/loadzone/Makefile.am (original)
+++ trunk/src/bin/loadzone/Makefile.am Wed Mar 17 17:21:10 2010
@@ -4,5 +4,6 @@
 
 b10-loadzone: b10-loadzone.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" \
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" b10-loadzone.py >$@
 	chmod a+x $@

Modified: trunk/src/bin/loadzone/b10-loadzone.py.in
==============================================================================
--- trunk/src/bin/loadzone/b10-loadzone.py.in (original)
+++ trunk/src/bin/loadzone/b10-loadzone.py.in Wed Mar 17 17:21:10 2010
@@ -39,7 +39,7 @@
         usage()
         exit(2)
 
-    dbfile = '/tmp/zone.sqlite3'
+    dbfile = '@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3'
     initial_origin = ''
     for o, a in opts:
         if o in ("-d", "--dbfile"):

Modified: trunk/src/bin/loadzone/b10-loadzone.xml
==============================================================================
--- trunk/src/bin/loadzone/b10-loadzone.xml (original)
+++ trunk/src/bin/loadzone/b10-loadzone.xml Wed Mar 17 17:21:10 2010
@@ -84,9 +84,10 @@
 
       <varlistentry>
         <term>-d <replaceable class="parameter">database</replaceable> </term>
-<listitem><para>
-  Defines the filename for the database.
-          The default is <filename>/tmp/zone.sqlite3</filename>.
+        <listitem><para>
+          Defines the filename for the database.
+	  The default is
+	  <filename>/usr/local/var/bind10/zone.sqlite3</filename>.
 <!-- TODO: fix filename -->
         </para></listitem>
       </varlistentry>