From be24f16e88401e9e4aece0a5ccdf2df69a2e38fc Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim@sentrium.io>
Date: Sun, 8 Aug 2021 10:31:10 -0500
Subject: T169: Image install should put correct serial console device in
 created grub menuentry

---
 scripts/install/install-image-existing | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index 0acfcb1f..d00d7735 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -257,6 +257,18 @@ if [ -e "$DEF_GRUB" ]; then
   cat $def_grub_vers >> $new_grub_cfg
   sed -n '/^menuentry/,${p}' $old_grub_cfg >>$new_grub_cfg
   sed -i "s/^set default=[0-9]\+$/set default=$new_index/" $new_grub_cfg
+  for tty in ttyS ttyUSB; do
+    x=1
+    declare -i x
+      for line in $(cat $old_grub_cfg); do
+        oldtty=$(echo -e $line | egrep -o "console=${tty}.*," | sed 's/,$//')
+        if [ -n "$oldtty" ]; then
+          awk -i inplace "/console=${tty}/{count++;if(count==$x){sub(\"console=${tty}0\",\"$(echo -e ${oldtty})\")}}; { print }" $new_grub_cfg
+          sync
+          x+=1
+        fi
+      done
+  done
   mv $new_grub_cfg $old_grub_cfg
 
   # Update the default image symlink used by Xen
-- 
cgit v1.2.3