From 413fcf92759b244ac9be359a0a53059a537c367e Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 12 Feb 2016 09:41:40 -0600 Subject: [PATCH] Do not disable multi-arch on precise Expressed the conditional as != precise to future-proof for when xenial comes out. Change-Id: Icdde40c638d2baf3b86eb58ff42f0132d1181b0b --- nodepool/scripts/configure_mirror.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh index 29a8ea56fd..6f46419a8d 100755 --- a/nodepool/scripts/configure_mirror.sh +++ b/nodepool/scripts/configure_mirror.sh @@ -56,8 +56,10 @@ deb $NODEPOOL_UBUNTU_MIRROR $LSBDISTCODENAME-updates main universe deb $NODEPOOL_UBUNTU_MIRROR $LSBDISTCODENAME-backports main universe deb $NODEPOOL_UBUNTU_MIRROR $LSBDISTCODENAME-security main universe EOF - # Turn off multi-arch - sudo dpkg --remove-architecture i386 + if [ "$LSBDISTCODENAME" != 'precise' ] ; then + # Turn off multi-arch + sudo dpkg --remove-architecture i386 + fi # Turn off checking of GPG signatures sudo dd of=/etc/apt/apt.conf.d/99unauthenticated <