From 14192a6c21b4e505a4d33a65164b86805bf6fa8b Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Sat, 2 May 2020 11:55:37 -0400
Subject: [PATCH] Disable cloud-init and remove double-console line

---
 misc/ubuntu20.04deploy/custom-installation/firstboot.sh         | 2 ++
 .../custom-installation/hooks/casper-bottom.sh                  | 2 --
 misc/ubuntu20.04deploy/scripts/init-premount/confluent          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/misc/ubuntu20.04deploy/custom-installation/firstboot.sh b/misc/ubuntu20.04deploy/custom-installation/firstboot.sh
index 5d39121a..08466532 100755
--- a/misc/ubuntu20.04deploy/custom-installation/firstboot.sh
+++ b/misc/ubuntu20.04deploy/custom-installation/firstboot.sh
@@ -7,3 +7,5 @@ if [ ! -z "$rootpw" -a "$rootpw" != "null" ]; then
 	echo root:$rootpw | chpasswd -e
 fi
 hostnamectl set-hostname $(grep ^NODENAME: /etc/confluent/confluent.info | awk '{print $2}')
+touch /etc/cloud/cloud-init.disabled
+rm -rf /etc/confluent/
diff --git a/misc/ubuntu20.04deploy/custom-installation/hooks/casper-bottom.sh b/misc/ubuntu20.04deploy/custom-installation/hooks/casper-bottom.sh
index fdfdda6c..e72e6658 100755
--- a/misc/ubuntu20.04deploy/custom-installation/hooks/casper-bottom.sh
+++ b/misc/ubuntu20.04deploy/custom-installation/hooks/casper-bottom.sh
@@ -45,8 +45,6 @@ fi
 if [ ! -z "$cons" ]; then
     echo "Installation will proceed on graphics console, autoconsole cannot work during install for Ubuntu" > ${cons%,*}
     #fcmdline="$fcmdline console=${cons#/dev/}"
-elif grep console= /proc/cmdline; then
-    fcmdline=$fcmdline" "$(sed -e s/.*console=/console=/ -e 's/ .*//' /proc/cmdline)
 fi
 echo $fcmdline > /custom-installation/confluent/fakecmdline
 /scripts/casper-bottom/58server_network
diff --git a/misc/ubuntu20.04deploy/scripts/init-premount/confluent b/misc/ubuntu20.04deploy/scripts/init-premount/confluent
index e60f19b9..aae886d9 100755
--- a/misc/ubuntu20.04deploy/scripts/init-premount/confluent
+++ b/misc/ubuntu20.04deploy/scripts/init-premount/confluent
@@ -22,7 +22,7 @@ echo $osprofile > /custom-installation/confluent/osprofile
 echo URL=http://${MGR}/confluent-public/os/$osprofile/distribution/live.iso >> /conf/param.conf
 fcmdline="$(cat /custom-installation/confluent/cmdline.orig) url=http://${MGR}/confluent-public/os/$osprofile/distribution/live.iso"
 if [ ! -z "$cons" ]; then
-    fcmdline="$fcmdline console=${console#/dev/}"
+    fcmdline="$fcmdline console=${cons#/dev/}"
 fi
 echo $fcmdline > /custom-installation/confluent/fakecmdline
 mount -o bind /custom-installation/confluent/fakecmdline /proc/cmdline