1.1 --- a/user-postsetup Tue Jul 12 00:47:20 2011 +0200
1.2 +++ b/user-postsetup Wed Jul 13 00:43:11 2011 +0200
1.3 @@ -1,5 +1,4 @@
1.4 #!/bin/sh
1.5 -# Usage: user-postsetup [ --root [ --dev ] ] [ <country> ]
1.6
1.7 # Configuration:
1.8 if [ -e userinstall-defaults ]; then
1.9 @@ -7,12 +6,15 @@
1.10 elif [ -e /etc/default/userinstall ]; then
1.11 . /etc/default/userinstall
1.12 else
1.13 - echo "No defaults found for userinstall."
1.14 + echo "No defaults found for userinstall." 1>&2
1.15 exit 1
1.16 fi
1.17
1.18 -if [[ "$1" && "$1" = '--root' ]]; then
1.19 - export AS_ROOT=' --root'
1.20 +if [ "$1" = '--help' ]; then
1.21 + echo "Usage: `basename $0` [ --root ] [ <country> ]" 1>&2
1.22 +elif [ "$1" = '--root' ]; then
1.23 + AS_ROOT="$1"
1.24 + AS_USER="sudo"
1.25 shift 1
1.26 fi
1.27
1.28 @@ -20,42 +22,47 @@
1.29
1.30 THIS_DIR=`dirname "$0"`
1.31
1.32 -echo "Copying host DNS configuration..."
1.33 -cp /etc/resolv.conf "$PACKAGEROOT/etc/"
1.34 +if [ ! "$PACKAGEROOT" ] || [ "$PACKAGEROOT" = '/' ]; then
1.35 + echo "The package root must be specified and not be set to / (the system root)." 1>&2
1.36 + exit 1
1.37 +fi
1.38
1.39 -echo "Copying filesystems configuration..."
1.40 -cp /etc/fstab "$PACKAGEROOT/etc/"
1.41 +echo "Copying host DNS configuration..." 1>&2
1.42 +"$AS_USER" cp /etc/resolv.conf "$PACKAGEROOT/etc/"
1.43 +
1.44 +echo "Copying filesystems configuration..." 1>&2
1.45 +"$AS_USER" cp /etc/fstab "$PACKAGEROOT/etc/"
1.46
1.47 -echo "Copying network configuration..."
1.48 -cp /etc/hosts "$PACKAGEROOT/etc/"
1.49 -cp /etc/network/interfaces "$PACKAGEROOT/etc/network/"
1.50 +echo "Copying network configuration..." 1>&2
1.51 +"$AS_USER" cp /etc/hosts "$PACKAGEROOT/etc/"
1.52 +"$AS_USER" cp /etc/network/interfaces "$PACKAGEROOT/etc/network/"
1.53
1.54 -echo "Copying package repository configuration..."
1.55 +echo "Copying package repository configuration..." 1>&2
1.56 if [ "$USERINSTALL_CODENAME" = "$DISTRIB_CODENAME" ]; then
1.57 - cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/"
1.58 + "$AS_USER" cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/"
1.59 elif [ -e "$USERINSTALL_CODENAME/sources.list" ]; then
1.60 - cp "$USERINSTALL_CODENAME/sources.list" "$PACKAGEROOT/etc/apt/"
1.61 + "$AS_USER" cp "$USERINSTALL_CODENAME/sources.list" "$PACKAGEROOT/etc/apt/"
1.62 else
1.63 - echo "Attempting to generate a repository definition for $USERINSTALL_CODENAME."
1.64 - "$THIS_DIR/user-makesources" "$PACKAGEROOT/etc/apt/sources.list" "$COUNTRY"
1.65 + echo "Attempting to generate a repository definition for $USERINSTALL_CODENAME." 1>&2
1.66 + "$AS_USER" "$THIS_DIR/user-makesources" "$PACKAGEROOT/etc/apt/sources.list" "$COUNTRY"
1.67 fi
1.68
1.69 if [ "$AS_ROOT" ]; then
1.70 - echo "Mounting filesystems..."
1.71 - "$THIS_DIR/user-do"$AS_ROOT mount -t proc proc /proc
1.72 + echo "Mounting filesystems..." 1>&2
1.73 + "$THIS_DIR/user-do" $AS_ROOT mount -t proc proc /proc
1.74 fi
1.75
1.76 -echo "Updating package details and upgrading..."
1.77 -"$THIS_DIR/user-do"$AS_ROOT apt-get update
1.78 -"$THIS_DIR/user-do"$AS_ROOT apt-get upgrade
1.79 +echo "Updating package details and upgrading..." 1>&2
1.80 +"$THIS_DIR/user-do" $AS_ROOT apt-get update
1.81 +"$THIS_DIR/user-do" $AS_ROOT apt-get upgrade
1.82
1.83 if [ "$AS_ROOT" ]; then
1.84 - echo "Configuring a root installation..."
1.85 - "$THIS_DIR/user-do"$AS_ROOT apt-get install locales console-data
1.86 - "$THIS_DIR/user-do"$AS_ROOT dpkg-reconfigure locales
1.87 - "$THIS_DIR/user-do"$AS_ROOT dpkg-reconfigure tzdata
1.88 - "$THIS_DIR/user-do"$AS_ROOT dpkg-reconfigure console-data
1.89 + echo "Configuring a root installation..." 1>&2
1.90 + "$THIS_DIR/user-do" $AS_ROOT apt-get install locales console-data
1.91 + "$THIS_DIR/user-do" $AS_ROOT dpkg-reconfigure locales
1.92 + "$THIS_DIR/user-do" $AS_ROOT dpkg-reconfigure tzdata
1.93 + "$THIS_DIR/user-do" $AS_ROOT dpkg-reconfigure console-data
1.94
1.95 - echo "Unmounting filesystems..."
1.96 - "$THIS_DIR/user-do"$AS_ROOT umount /proc
1.97 + echo "Unmounting filesystems..." 1>&2
1.98 + "$THIS_DIR/user-do" $AS_ROOT umount /proc
1.99 fi