From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 27 Jan 2008 20:21:09 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/dcp
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=10557581a6d203fc90819f3db1504c65fd4770fd;hp=664ffd32720cf3428a17e5dc59755fb09d19fff1;p=dcp.git

Merge branch 'master' of git.dolda2000.com:/srv/git/r/dcp
---

diff --git a/dcp-init b/dcp-init
index 68296d5..3730fb6 100755
--- a/dcp-init
+++ b/dcp-init
@@ -55,6 +55,11 @@ initbase() {
     mkdir "$td/control/update.d"
     cat >"$td/control/functions" <<EOF
 readconf() {
+    if [ -r "$HOME/.dcp-build-conf" ]; then
+        while read key val; do
+            export "CONF_\$key"="\$val"
+        done <"$HOME/.dcp-build-conf"
+    fi
     while read key val; do
         export "CONF_\$key"="\$val"
     done <control/conf