+ * pbuilder-user-mode-linux: change the filenames to pbuilder.conf pbuilder-uml.conf

+
+	* pbuilder-user-mode-linux.1: document config files.
+
+	* pbuilder-uml.conf: change filename.
+
+	* uml.conf: new file created.
+
 	* pbuilder-user-mode-linux (BUILDING_DSC_FILE): add update after create. It should work better.
+	(UML_MOUNT_TMPFS): add config file loading routine.

5 files changed, 37 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ba3fd2..230cdee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 2002-09-18  Junichi Uekawa  <dancer@debian.org>
 
+	* pbuilder-user-mode-linux: change the filenames to pbuilder.conf pbuilder-uml.conf
+
+	* pbuilder-user-mode-linux.1: document config files.
+
+	* pbuilder-uml.conf: change filename.
+
+	* uml.conf: new file created.
+
 	* pbuilder-user-mode-linux (BUILDING_DSC_FILE): add update after create. It should work better.
+	(UML_MOUNT_TMPFS): add config file loading routine.
 
 2002-09-17  Junichi Uekawa  <dancer@debian.org>
 
diff --git a/Makefile b/Makefile
index 9439f24..c5b946f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ TAGS:
 
 install:
 	$(INSTALL_DIRECTORY) $(DESTDIR)/etc
+	$(INSTALL_DIRECTORY) $(DESTDIR)/etc/pbuilder
 	$(INSTALL_DIRECTORY) $(DESTDIR)/usr/sbin
 	$(INSTALL_DIRECTORY) $(DESTDIR)/usr/bin
 	$(INSTALL_DIRECTORY) $(DESTDIR)/usr/lib/pbuilder
@@ -30,6 +31,8 @@ install:
 	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_FILE) pbuilderrc $(DESTDIR)/etc
 	$(INSTALL_FILE) pbuilderrc $(DESTDIR)/usr/share/pbuilder
+	$(INSTALL_FILE) pbuilder-uml.conf $(DESTDIR)/etc/pbuilder
+	$(INSTALL_FILE) pbuilder-uml.conf $(DESTDIR)/usr/share/pbuilder
 	$(INSTALL_EXECUTABLE) examples/B90linda $(DESTDIR)/usr/share/doc/pbuilder/examples
 	$(INSTALL_EXECUTABLE) examples/D10tmp $(DESTDIR)/usr/share/doc/pbuilder/examples
 
diff --git a/pbuilder-uml.conf b/pbuilder-uml.conf
new file mode 100644
index 0000000..a2ea5dc
--- /dev/null
+++ b/pbuilder-uml.conf
@@ -0,0 +1,8 @@
+MY_ETH0=tuntap,,,192.168.30.62
+UML_IP=192.168.30.199
+UML_NETMASK=255.255.255.0
+UML_NETWORK=192.168.30.0
+UML_BROADCAST=255.255.255.255
+UML_GATEWAY=192.168.30.1
+PBUILDER_UML_IMAGE="/tmp/uml"
+UML_MOUNT_TMPFS="no"
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 0d7437f..be1c5bd 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -24,15 +24,12 @@ function cleanup_function () {
     rm -f ${INSIDE_PBUILDER}
 }
 
-#default settings -- only for me.
-MY_ETH0=tuntap,,,192.168.30.62
-UML_IP=192.168.30.199
-UML_NETMASK=255.255.255.0
-UML_NETWORK=192.168.30.0
-UML_BROADCAST=255.255.255.255
-UML_GATEWAY=192.168.30.1
-PBUILDER_UML_IMAGE="/tmp/uml"
-UML_MOUNT_TMPFS="no"
+
+for CONFIGFILE in /etc/pbuilder/pbuilder-uml.conf /usr/share/pbuilder/pbuilder-uml.conf ${HOME}/.pbuilderrc; do
+    if [ -f ${CONFIGFILE} ]; then
+	. ${CONFIGFILE}
+    fi
+done
 
 function operate_uml () {
     # opeartes on UML, and runs pbuilder $1
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index 4f3cb64..e47eb06 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -42,6 +42,17 @@ within the user-mode-linux environment.
 This software is in early stage of development. 
 Reading the source may help you in case this software doesn't work for you.
 
+
+.SH "FILES"
+.TP
+.B "/etc/pbuilder/pbuilder-uml.conf"
+System-wide configuration file.
+.TP
+.B "/usr/share/pbuilder/pbuilder-uml.conf"
+Software-default configuration file.
+.TP
+.B "${HOME}/.pbuilderrc"
+User-default configuration file.
 .SH "SEE ALSO"
 .RI "pdebuild (" 1 "), "
 .RI "pbuilder (" 8 "), "