# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1352057741 -3600
# Node ID 82028abe0236498b8b3cb5c51dcbc2d62e43cd1c
# Parent  4c9f2e669f07276930e1c40ffbd318ef9e3cb0f0
Fixed expansion of AS_USER.

diff -r 4c9f2e669f07 -r 82028abe0236 uml-linux-build
--- a/uml-linux-build	Sun Nov 04 18:55:29 2012 +0100
+++ b/uml-linux-build	Sun Nov 04 20:35:41 2012 +0100
@@ -67,7 +67,7 @@
 fi
 
 echo "Installing the modules..." 1>&2
-"$THISDIR/uml-access-image" "$AS_USER" make -C "$LINUXDIRNAME" modules_install INSTALL_MOD_PATH="$IMAGEDIR" ARCH=um
+"$THISDIR/uml-access-image" $AS_USER make -C "$LINUXDIRNAME" modules_install INSTALL_MOD_PATH="$IMAGEDIR" ARCH=um
 
 # Now get the executable and remove the build directory.
 if [ ! -e linux ]; then
diff -r 4c9f2e669f07 -r 82028abe0236 uml-make-image
--- a/uml-make-image	Sun Nov 04 18:55:29 2012 +0100
+++ b/uml-make-image	Sun Nov 04 20:35:41 2012 +0100
@@ -63,6 +63,6 @@
 # Image population activities.
 
 if [ ! "$DO_NOT_POPULATE" ]; then
-        "$AS_USER" "$THISDIR/uml-access-image" "$THISDIR/uml-populate-image"
-        "$AS_USER" "$THISDIR/uml-access-image" "$THISDIR/uml-make-network"
+        $AS_USER "$THISDIR/uml-access-image" "$THISDIR/uml-populate-image"
+        $AS_USER "$THISDIR/uml-access-image" "$THISDIR/uml-make-network"
 fi
diff -r 4c9f2e669f07 -r 82028abe0236 user-postsetup
--- a/user-postsetup	Sun Nov 04 18:55:29 2012 +0100
+++ b/user-postsetup	Sun Nov 04 20:35:41 2012 +0100
@@ -28,27 +28,27 @@
 fi
 
 echo "Copying host DNS configuration..." 1>&2
-"$AS_USER" cp /etc/resolv.conf "$PACKAGEROOT/etc/"
+$AS_USER cp /etc/resolv.conf "$PACKAGEROOT/etc/"
 
 echo "Copying filesystems configuration..." 1>&2
-"$AS_USER" cp /etc/fstab "$PACKAGEROOT/etc/"
+$AS_USER cp /etc/fstab "$PACKAGEROOT/etc/"
 
 echo "Copying network configuration..." 1>&2
-"$AS_USER" cp /etc/hosts "$PACKAGEROOT/etc/"
-"$AS_USER" cp /etc/network/interfaces "$PACKAGEROOT/etc/network/"
+$AS_USER cp /etc/hosts "$PACKAGEROOT/etc/"
+$AS_USER cp /etc/network/interfaces "$PACKAGEROOT/etc/network/"
 
 echo "Copying package repository configuration..." 1>&2
 
 # For installations of the same distribution, copy the host's sources list.
 
 if [ "$USERINSTALL_CODENAME" = "$DISTRIB_CODENAME" ]; then
-        "$AS_USER" cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/"
+        $AS_USER cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/"
 
 # Otherwise, attempt to make a new sources list.
 
 else
 	echo "Attempting to generate a repository definition for $USERINSTALL_CODENAME." 1>&2
-	"$AS_USER" USERINSTALL_ID="$USERINSTALL_ID" USERINSTALL_CODENAME="$USERINSTALL_CODENAME" \
+	$AS_USER USERINSTALL_ID="$USERINSTALL_ID" USERINSTALL_CODENAME="$USERINSTALL_CODENAME" \
 		"$THIS_DIR/user-makesources" "$PACKAGEROOT/etc/apt/sources.list" "$COUNTRY"
 fi