1.1 --- a/uml-linux-build Sun Nov 04 18:55:29 2012 +0100
1.2 +++ b/uml-linux-build Sun Nov 04 20:35:41 2012 +0100
1.3 @@ -67,7 +67,7 @@
1.4 fi
1.5
1.6 echo "Installing the modules..." 1>&2
1.7 -"$THISDIR/uml-access-image" "$AS_USER" make -C "$LINUXDIRNAME" modules_install INSTALL_MOD_PATH="$IMAGEDIR" ARCH=um
1.8 +"$THISDIR/uml-access-image" $AS_USER make -C "$LINUXDIRNAME" modules_install INSTALL_MOD_PATH="$IMAGEDIR" ARCH=um
1.9
1.10 # Now get the executable and remove the build directory.
1.11 if [ ! -e linux ]; then
2.1 --- a/uml-make-image Sun Nov 04 18:55:29 2012 +0100
2.2 +++ b/uml-make-image Sun Nov 04 20:35:41 2012 +0100
2.3 @@ -63,6 +63,6 @@
2.4 # Image population activities.
2.5
2.6 if [ ! "$DO_NOT_POPULATE" ]; then
2.7 - "$AS_USER" "$THISDIR/uml-access-image" "$THISDIR/uml-populate-image"
2.8 - "$AS_USER" "$THISDIR/uml-access-image" "$THISDIR/uml-make-network"
2.9 + $AS_USER "$THISDIR/uml-access-image" "$THISDIR/uml-populate-image"
2.10 + $AS_USER "$THISDIR/uml-access-image" "$THISDIR/uml-make-network"
2.11 fi
3.1 --- a/user-postsetup Sun Nov 04 18:55:29 2012 +0100
3.2 +++ b/user-postsetup Sun Nov 04 20:35:41 2012 +0100
3.3 @@ -28,27 +28,27 @@
3.4 fi
3.5
3.6 echo "Copying host DNS configuration..." 1>&2
3.7 -"$AS_USER" cp /etc/resolv.conf "$PACKAGEROOT/etc/"
3.8 +$AS_USER cp /etc/resolv.conf "$PACKAGEROOT/etc/"
3.9
3.10 echo "Copying filesystems configuration..." 1>&2
3.11 -"$AS_USER" cp /etc/fstab "$PACKAGEROOT/etc/"
3.12 +$AS_USER cp /etc/fstab "$PACKAGEROOT/etc/"
3.13
3.14 echo "Copying network configuration..." 1>&2
3.15 -"$AS_USER" cp /etc/hosts "$PACKAGEROOT/etc/"
3.16 -"$AS_USER" cp /etc/network/interfaces "$PACKAGEROOT/etc/network/"
3.17 +$AS_USER cp /etc/hosts "$PACKAGEROOT/etc/"
3.18 +$AS_USER cp /etc/network/interfaces "$PACKAGEROOT/etc/network/"
3.19
3.20 echo "Copying package repository configuration..." 1>&2
3.21
3.22 # For installations of the same distribution, copy the host's sources list.
3.23
3.24 if [ "$USERINSTALL_CODENAME" = "$DISTRIB_CODENAME" ]; then
3.25 - "$AS_USER" cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/"
3.26 + $AS_USER cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/"
3.27
3.28 # Otherwise, attempt to make a new sources list.
3.29
3.30 else
3.31 echo "Attempting to generate a repository definition for $USERINSTALL_CODENAME." 1>&2
3.32 - "$AS_USER" USERINSTALL_ID="$USERINSTALL_ID" USERINSTALL_CODENAME="$USERINSTALL_CODENAME" \
3.33 + $AS_USER USERINSTALL_ID="$USERINSTALL_ID" USERINSTALL_CODENAME="$USERINSTALL_CODENAME" \
3.34 "$THIS_DIR/user-makesources" "$PACKAGEROOT/etc/apt/sources.list" "$COUNTRY"
3.35 fi
3.36