From c448864901b4aad07d5e70dfade3e8fb24952bba Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 28 Aug 2017 17:01:03 +1000
Subject: [PATCH] Use [[ for =~ matches

Avoid incorrect use of [ with =~ matching

I guess this doesn't trip "-e" because it's in an if-conditional.  I'm
looking at making bashate detect this; maybe we can run bashate over
things we know are scripts

Change-Id: Ia3fe2b978fae5bdaadbb1789058180d3ad950d00
---
 diskimage_builder/elements/bootloader/cleanup.d/51-bootloader  | 2 +-
 diskimage_builder/elements/bootloader/finalise.d/50-bootloader | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader b/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader
index 1ba0485ee..28e02b6a6 100755
--- a/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader
+++ b/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader
@@ -39,7 +39,7 @@ fi
 select_boot_kernel_initrd $TARGET_ROOT
 
 # Serial console on Power is hvc0
-if [ "powerpc ppc64 ppc64le" =~ "$ARCH" ] ; then
+if [[ "powerpc ppc64 ppc64le" =~ "$ARCH" ]] ; then
     SERIAL_CONSOLE="hvc0"
 else
     SERIAL_CONSOLE="ttyS0,115200"
diff --git a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
index 162e4ab01..4b9f9df77 100755
--- a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
+++ b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
@@ -147,7 +147,7 @@ function install_grub2 {
     echo 'GRUB_GFXPAYLOAD_LINUX=text' >>/etc/default/grub
 
     # Serial console on Power is hvc0
-    if [ "powerpc ppc64 ppc64le" =~ "$ARCH" ] ; then
+    if [[ "powerpc ppc64 ppc64le" =~ "$ARCH" ]]; then
         SERIAL_CONSOLE="hvc0"
     else
         SERIAL_CONSOLE="ttyS0,115200"