From f07bad6022d88a7cdcd48541fc4a5761f71b7ef2 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@redhat.com>
Date: Aug 30 2018 14:22:29 +0000
Subject: Rework console logic to enable uart in config.txt for rpi.


---

diff --git a/arm-image-installer b/arm-image-installer
index 6b5656c..81a2d4d 100755
--- a/arm-image-installer
+++ b/arm-image-installer
@@ -374,7 +374,7 @@ if [ "$RESIZEFS" != "" ]; then
 		fi
 	fi
 	
-	if [ "$(echo $IMAGE | grep -E '(iot|armhfp)')" = "" ]; then
+	if [ "$(echo $IMAGE | grep -i 'armhfp')" = "" ]; then
 		FS_TYPE=$(sudo blkid "$ROOTPART" | cut -d'"' -f 4)
 	else
 		FS_TYPE=$(sudo blkid "$ROOTPART" | cut -d'"' -f 6)
@@ -461,13 +461,15 @@ if [ "$SSH_KEY" != "" ]; then
 fi
 	
 # Add console
-if [ "$CONSOLE" = "1" ] && [ -f /tmp/boot/extlinux/extlinux.conf ]; then
-	if [ "$SYSCON" = "" ]; then
-		SYSCON="ttyS0,115200"
-		echo "= No console listed for $TARGET, adding default $SYSCON ."
+if [ "$CONSOLE" = "1" ]; then
+	if [ "$SYSCON" = "" ]; then 
+                SYSCON="ttyS0,115200" 
+                echo "= No console listed for $TARGET, adding default $SYSCON ." 
+        fi 
+       	if [ -f /tmp/boot/extlinux/extlinux.conf ]; then
+		echo "= Adding console $SYSCON to extlinux.conf ..."
+	       	sed -i "s|append|& console=$SYSCON console=tty0 |" /tmp/boot/extlinux/extlinux.conf
 	fi
-       	echo "= Adding console $SYSCON to extlinux.conf ..."
-       	sed -i "s|append|& console=$SYSCON console=tty0 |" /tmp/boot/extlinux/extlinux.conf
 	if [ "$TARGET" = "rpi2" ] || [ "$TARGET" = "rpi3" ]; then
 		mkdir /tmp/fw &> /dev/null
 		mount "$FIRMPART" /tmp/fw &> /dev/null