1.1 --- a/user-setup Sun Aug 26 19:28:26 2007 +0200
1.2 +++ b/user-setup Sun Aug 26 19:44:27 2007 +0200
1.3 @@ -2,11 +2,13 @@
1.4 # Usage: user-setup [ <mirror> ]
1.5
1.6 # Configuration:
1.7 -if [ -e /etc/defaults/userinstall ]; then
1.8 +if [ -e userinstall-defaults ]; then
1.9 + source userinstall-defaults
1.10 +elif [ -e /etc/defaults/userinstall ]; then
1.11 source /etc/defaults/userinstall
1.12 else
1.13 - source userinstall-defaults
1.14 + echo "No defaults found for userinstall."
1.15 + exit 1
1.16 fi
1.17
1.18 fakeroot fakechroot debootstrap --variant=fakechroot $DISTNAME $PACKAGEROOT $1
1.19 -./user-apt -f install