From 53f466535888e796888f0ace5143bb93a05e755d Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 20 Apr 2023 14:48:39 -0400
Subject: [PATCH] Correct issues in Ubuntu 18 deployment

---
 .../lib/debian-installer-startup.d/S25confluentinit   | 11 -----------
 .../ubuntu18.04/profiles/default/preseed.cfg          |  2 --
 2 files changed, 13 deletions(-)

diff --git a/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit b/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit
index b1099743..8759d669 100644
--- a/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit
+++ b/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit
@@ -41,15 +41,6 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
     sed -n '/^net_cfgs:/,/^[^- ]/{/^[^- ]/!p}' cnflnt.yml |sed -n '/^-/,/^-/{/^-/!p}'| sed -e 's/^[- ]*//'> $tcfg
     autoconfigmethod=$(grep ^ipv4_method: $tcfg)
     autoconfigmethod=${autoconfigmethod#ipv4_method: }
-    for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK|cut -d ' ' -f 2 | sed -e 's/:$//'); do
-        for dsrv in $deploysrvs; do
-            if wget https://$dsrv/confluent-public/ --tries=1 --timeout=1 -O /dev/null > /dev/null 2>&1; then
-                deploysrvs=$dsrv
-                NIC=$NICGUESS
-            fi
-        done
-    done
-    deploysrvs=$dsrv
     if [ "$autoconfigmethod" = "static" ]; then
         setdebopt netcfg/disable_dhcp true boolean
         v4addr=$(grep ^ipv4_address: $tcfg|cut -d: -f 2|sed -e 's/ //')
@@ -212,5 +203,3 @@ if [ ! -e /dev/disk/by-label/CNFLNT_IDNT ]; then
         setdebopt netcfg/confirm_static false boolean
     fi
 fi
-
-
diff --git a/confluent_osdeploy/ubuntu18.04/profiles/default/preseed.cfg b/confluent_osdeploy/ubuntu18.04/profiles/default/preseed.cfg
index a66669ae..4b5f71a7 100644
--- a/confluent_osdeploy/ubuntu18.04/profiles/default/preseed.cfg
+++ b/confluent_osdeploy/ubuntu18.04/profiles/default/preseed.cfg
@@ -7,8 +7,6 @@ d-i partman/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
-d-i preseed/late_command string sleep 86400
-d-i partman/early_command string sleep 86400
 d-i passwd/make-user boolean false
 d-i clock-setup/utc boolean true
 d-i apt-setup/multiverse boolean false