Browse Source

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


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1483 e5f2f494-b856-4b98-b285-d166d9295462

Jeremy C. Reed 15 years ago
parent
commit
2bf4c79e3f

+ 1 - 0
src/bin/loadzone/Makefile.am

@@ -4,5 +4,6 @@ CLEANFILES = b10-loadzone
 
 b10-loadzone: b10-loadzone.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" \
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" b10-loadzone.py >$@
 	chmod a+x $@

+ 1 - 1
src/bin/loadzone/b10-loadzone.py.in

@@ -39,7 +39,7 @@ def main():
         usage()
         exit(2)
 
-    dbfile = '/tmp/zone.sqlite3'
+    dbfile = '@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3'
     initial_origin = ''
     for o, a in opts:
         if o in ("-d", "--dbfile"):

+ 4 - 3
src/bin/loadzone/b10-loadzone.xml

@@ -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>