1.1 --- a/user-setup Mon Mar 29 00:10:33 2010 +0200
1.2 +++ b/user-setup Thu Apr 15 00:44:21 2010 +0200
1.3 @@ -12,22 +12,20 @@
1.4 fi
1.5
1.6 if [[ $1 == "--help" ]]; then
1.7 - echo "Usage: user-setup [ <mirror> ]"
1.8 + echo "Usage: user-setup [ --root ] [ <mirror> ]"
1.9 echo
1.10 echo "Examples:"
1.11 echo
1.12 echo "user-setup"
1.13 echo "user-setup file:///tmp/$USERINSTALL_CODENAME/"
1.14 echo "user-setup http://ftp.xx.debian.org/debian/"
1.15 + echo "user-setup --root http://ftp.xx.debian.org/debian/"
1.16 exit 1
1.17 fi
1.18
1.19 if [[ $1 && $1 == '--root' ]]; then
1.20 - export AS_ROOT=true
1.21 + export AS_ROOT=' --root'
1.22 export MIRROR=$2
1.23 -elif [[ $2 && $2 == '--root' ]]; then
1.24 - export AS_ROOT=true
1.25 - export MIRROR=$1
1.26 else
1.27 export MIRROR=$1
1.28 fi
1.29 @@ -42,8 +40,4 @@
1.30 echo
1.31 echo "Don't forget to run the following before installing packages:"
1.32 echo
1.33 -echo "user-apt-get update"
1.34 -
1.35 -if [[ $AS_ROOT ]]; then
1.36 - echo "dpkg-reconfigure locales"
1.37 -fi
1.38 +echo "user-postsetup$AS_ROOT [ <country> ]"