1.1 --- a/user-enter Sun Mar 21 01:34:38 2010 +0100
1.2 +++ b/user-enter Mon Mar 29 00:10:33 2010 +0200
1.3 @@ -11,4 +11,8 @@
1.4 exit 1
1.5 fi
1.6
1.7 -fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT
1.8 +if [[ $1 == '--root' ]]; then
1.9 + chroot $PACKAGEROOT
1.10 +else
1.11 + fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT
1.12 +fi
2.1 --- a/user-setup Sun Mar 21 01:34:38 2010 +0100
2.2 +++ b/user-setup Mon Mar 29 00:10:33 2010 +0200
2.3 @@ -1,5 +1,5 @@
2.4 #!/bin/bash
2.5 -# Usage: user-setup [ <mirror> ]
2.6 +# Usage: user-setup [ --root ] [ <mirror> ]
2.7
2.8 # Configuration:
2.9 if [ -e userinstall-defaults ]; then
2.10 @@ -22,8 +22,28 @@
2.11 exit 1
2.12 fi
2.13
2.14 -fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $1
2.15 +if [[ $1 && $1 == '--root' ]]; then
2.16 + export AS_ROOT=true
2.17 + export MIRROR=$2
2.18 +elif [[ $2 && $2 == '--root' ]]; then
2.19 + export AS_ROOT=true
2.20 + export MIRROR=$1
2.21 +else
2.22 + export MIRROR=$1
2.23 +fi
2.24 +
2.25 +if [[ $AS_ROOT ]]; then
2.26 + debootstrap --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $MIRROR
2.27 +else
2.28 + fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include=gnupg,$KEYRING \
2.29 + $USERINSTALL_CODENAME $PACKAGEROOT $MIRROR
2.30 +fi
2.31 +
2.32 echo
2.33 echo "Don't forget to run the following before installing packages:"
2.34 echo
2.35 echo "user-apt-get update"
2.36 +
2.37 +if [[ $AS_ROOT ]]; then
2.38 + echo "dpkg-reconfigure locales"
2.39 +fi