From 53ec477188c664b5ea4117953245b1e0eca7fa22 Mon Sep 17 00:00:00 2001
From: Lutz Schwarz <Lutz.Schwarz@vetrontypical.com>
Date: Thu, 3 Sep 2020 18:07:17 +0200
Subject: [PATCH] Fix detection of disabled console

---
 pishrink.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pishrink.sh b/pishrink.sh
index 3c70801..fbe88c7 100755
--- a/pishrink.sh
+++ b/pishrink.sh
@@ -189,7 +189,7 @@ function boot_enable_console () {
   local fsroot="$1"
   local bootstart="$(echo "$parted_output" | grep '^1:' | cut -d ':' -f 2 | tr -d 'B')"
   local boot bootloop bootroot
-  local SEDCMDS='s/console=null/console=tty0/'
+  local SEDCMDS='s/console=\(none\|null\)/console=tty0/'
 
   if [ -z "$fsroot" -o "x$bootstart" != "x$partstart" ]
   then
@@ -204,7 +204,7 @@ function boot_enable_console () {
 
   logVariables $LINENO fsroot bootstart bootloop bootroot boot
 
-  if grep -q console=null "$boot/cmdline.txt" ; then
+  if grep -q 'console=\(none\|null\)' "$boot/cmdline.txt" ; then
     info "/boot/cmdline.txt changed to temporarily enable console for autoexpand"
     cp -p "$boot/cmdline.txt" "$boot/cmdline.txt.pishrink-bak"
     sed -i "$boot/cmdline.txt" -e "$SEDCMDS"