Commit 5b7c52b2 authored by Joseph Bisch's avatar Joseph Bisch
Browse files

Swap Debian i386 flavour checks 

Check for older suites with 686 flavour before checking for 686-pae
flavour suites, because the former should never change, but the latter
would have to be changed whenever a new suite was released if it wasn't
the last if statement.
parent 4f69707c

bin/make-base-vm

+3 −3
Original line number Diff line number Diff line
@@ -94,10 +94,10 @@ fi 


if [ $DISTRO = "debian" -a $ARCH = "amd64" ]; then

  FLAVOUR=amd64

elif [ $DISTRO = "debian" -a $ARCH = "i386" -a \($SUITE = "wheezy" -o $SUITE = "jessie" -o $SUITE = "stretch" -o $SUITE = "sid"\) ]; then

  FLAVOUR=686-pae

elif [ $DISTRO = "debian" ]; then

elif [ $DISTRO = "debian" -a $ARCH = "i386" -a \($SUITE = "squeeze" -o $SUITE = "lenny" -o $SUITE = "etch" -o $SUITE = "sarge" -o $SUITE = "woody" -o $SUITE = "potato" -o $SUITE = "slink" -o $SUITE = "hamm" -o $SUITE = "bo" -o $SUITE = "rex" -o $SUITE = "buzz"\) ]; then

  FLAVOUR=686

elif [ $DISTRO = "debian" ]; then

  FLAVOUR=686-pae

fi



LOCALE_PKG=language-pack-en