Fix handling debian version in prepare-chroot-* scripts

The script get requested debian version as its second parameter. Save it
to a variable actually used in the script. Previously the script used
DEBIANVERSION variable (and in some places DIST), but the parameter was
set to DISTRO variable not used anywhere else. This caused the parameter
to be ignored and previous value of the DEBIANVERSION/DIST variables
used instead (which by a coincidence were the same).
Fix this by using DIST variable in all of those places consistently.

Author: marmarek

prepare-chroot-debian

@@ -16,7 +16,7 @@ fi
 # $2: distribution [wheezy, jessie]
 # ------------------------------------------------------------------------------
 DIR=$1
-DISTRO=$2
+DIST=$2
 
 set -e
 
@@ -53,7 +53,7 @@ if ! [ -d $DIR/home/user ]; then
     COMPONENTS="" $DEBOOTSTRAP_PREFIX debootstrap --arch=amd64 \
                 --include=ncurses-term,debian-keyring,$apt_https_pkgs,$eatmydata_maybe \
                 --keyring=${DEBIAN_PLUGIN_DIR}keys/$DIST-debian-archive-keyring.gpg \
-                $DEBIANVERSION $DIR https://deb.debian.org/debian \
+                $DIST $DIR https://deb.debian.org/debian \
                 || { echo "Error in debootstrap"; exit 1; }
 
     # --------------------------------------------------------------------------
@@ -152,7 +152,7 @@ fi
 # ------------------------------------------------------------------------------
 # Install Debian source repo
 # ------------------------------------------------------------------------------
-add_repo "deb-src https://deb.debian.org/debian ${DEBIANVERSION} main"
+add_repo "deb-src https://deb.debian.org/debian ${DIST} main"
 
 if [ -n "$USE_QUBES_REPO_VERSION" ]; then
     add_repo "deb [arch=amd64] https://deb.qubes-os.org/r${USE_QUBES_REPO_VERSION}/vm $DIST main"
@@ -174,6 +174,6 @@ wc -L "${DIR}/var/lib/apt/lists/"*InRelease | awk '$1 > 1024 {print; exit 1}'
 # Update debian apt sources list to use local qubes repo
 # ------------------------------------------------------------------------------
 cat > $DIR/etc/apt/sources.list.d/qubes-builder.list <<EOF
-deb [trusted=yes] file:/tmp/qubes-deb $DEBIANVERSION main
+deb [trusted=yes] file:/tmp/qubes-deb $DIST main
 EOF
 

prepare-chroot-qubuntu

@@ -11,7 +11,7 @@ fi
 # $2: distribution [trusty ]
 # ------------------------------------------------------------------------------
 DIR=$1
-DISTRO=$2
+DIST=$2
 
 set -e
 
@@ -42,7 +42,7 @@ if ! [ -d $DIR/home/user ]; then
     COMPONENTS="" $DEBOOTSTRAP_PREFIX debootstrap --arch=amd64 \
                 --include=ncurses-term,ubuntu-keyring,$eatmydata_maybe \
                 --keyring=${DEBIAN_PLUGIN_DIR}/keys/$DIST-qubuntu-archive-keyring.gpg \
-                $DEBIANVERSION $DIR http://archive.ubuntu.com/ubuntu \
+                $DIST $DIR http://archive.ubuntu.com/ubuntu \
                 || { echo "Error in debootstrap"; exit 1; }
 
     # --------------------------------------------------------------------------
@@ -127,6 +127,6 @@ chroot $DIR apt-get $APT_GET_OPTIONS install -y libpulse-dev
 # Update qubuntu apt sources list to use local qubes repo
 # ------------------------------------------------------------------------------
 cat > $DIR/etc/apt/sources.list.d/qubes-builder.list <<EOF
-deb [trusted=yes] file:/tmp/qubes-deb $DEBIANVERSION main
+deb [trusted=yes] file:/tmp/qubes-deb $DIST main
 EOF