# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1188150267 -7200
# Node ID aec852ce05f79615746c79411b1a05d7aa0b1c3d
# Parent  bdad9470416bb927d9969d38dc8df71c5a95f8e0
Let the local defaults file override any system defaults.
Remove the apt-get -f install invocation upon setup.

diff -r bdad9470416b -r aec852ce05f7 user-apt
--- a/user-apt	Sun Aug 26 19:28:26 2007 +0200
+++ b/user-apt	Sun Aug 26 19:44:27 2007 +0200
@@ -1,10 +1,13 @@
 #!/bin/bash
 
 # Configuration:
-if [ -e /etc/defaults/userinstall ]; then
-	source /etc/defaults/userinstall
+if [ -e userinstall-defaults ]; then
+        source userinstall-defaults
+elif [ -e /etc/defaults/userinstall ]; then
+        source /etc/defaults/userinstall
 else
-	source userinstall-defaults
+        echo "No defaults found for userinstall."
+        exit 1
 fi
 
 fakeroot fakechroot chroot $PACKAGEROOT apt-get $*
diff -r bdad9470416b -r aec852ce05f7 user-dpkg-i
--- a/user-dpkg-i	Sun Aug 26 19:28:26 2007 +0200
+++ b/user-dpkg-i	Sun Aug 26 19:44:27 2007 +0200
@@ -1,10 +1,13 @@
 #!/bin/bash
 
 # Configuration:
-if [ -e /etc/defaults/userinstall ]; then
+if [ -e userinstall-defaults ]; then
+        source userinstall-defaults
+elif [ -e /etc/defaults/userinstall ]; then
         source /etc/defaults/userinstall
 else
-        source userinstall-defaults
+        echo "No defaults found for userinstall."
+        exit 1
 fi
 
 export PERSONAL=$PACKAGEROOT/personal
diff -r bdad9470416b -r aec852ce05f7 user-setup
--- a/user-setup	Sun Aug 26 19:28:26 2007 +0200
+++ b/user-setup	Sun Aug 26 19:44:27 2007 +0200
@@ -2,11 +2,13 @@
 # Usage: user-setup [ <mirror> ]
 
 # Configuration:
-if [ -e /etc/defaults/userinstall ]; then
+if [ -e userinstall-defaults ]; then
+        source userinstall-defaults
+elif [ -e /etc/defaults/userinstall ]; then
         source /etc/defaults/userinstall
 else
-        source userinstall-defaults
+        echo "No defaults found for userinstall."
+	exit 1
 fi
 
 fakeroot fakechroot debootstrap --variant=fakechroot $DISTNAME $PACKAGEROOT $1
-./user-apt -f install