1.1 --- a/user-setup Sun Mar 21 01:34:38 2010 +0100
1.2 +++ b/user-setup Mon Mar 29 00:10:33 2010 +0200
1.3 @@ -1,5 +1,5 @@
1.4 #!/bin/bash
1.5 -# Usage: user-setup [ <mirror> ]
1.6 +# Usage: user-setup [ --root ] [ <mirror> ]
1.7
1.8 # Configuration:
1.9 if [ -e userinstall-defaults ]; then
1.10 @@ -22,8 +22,28 @@
1.11 exit 1
1.12 fi
1.13
1.14 -fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $1
1.15 +if [[ $1 && $1 == '--root' ]]; then
1.16 + export AS_ROOT=true
1.17 + export MIRROR=$2
1.18 +elif [[ $2 && $2 == '--root' ]]; then
1.19 + export AS_ROOT=true
1.20 + export MIRROR=$1
1.21 +else
1.22 + export MIRROR=$1
1.23 +fi
1.24 +
1.25 +if [[ $AS_ROOT ]]; then
1.26 + debootstrap --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $MIRROR
1.27 +else
1.28 + fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include=gnupg,$KEYRING \
1.29 + $USERINSTALL_CODENAME $PACKAGEROOT $MIRROR
1.30 +fi
1.31 +
1.32 echo
1.33 echo "Don't forget to run the following before installing packages:"
1.34 echo
1.35 echo "user-apt-get update"
1.36 +
1.37 +if [[ $AS_ROOT ]]; then
1.38 + echo "dpkg-reconfigure locales"
1.39 +fi