From 783c6ce7b6d4327c81b8bc50c364bca2e13d55b5 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 10 Jun 2020 10:37:14 -0400
Subject: [PATCH] Revise the esxi tar strategy

Finally, it has been ascertained
that ESXi rejecting the tar
was due to not having directories
explicitly listed, not because of
forbidding new paths or compression.
---
 confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel | 8 +++++---
 confluent_server/bin/osimage                      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel b/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
index 02e391d9..e2e47ef1 100644
--- a/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
+++ b/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
@@ -1,3 +1,4 @@
+#!/bin/sh
 # copernicus is hard coded, easier to script a fake sysfs
 uuid=$(vsish -e get /hardware/bios/dmiInfo|grep -A15 UUID|sed -e 's/.*://'|sed -e ':a;N;$!ba;s/\n//g' | sed -e 's/ *0x//g')
 uuid=${uuid:0:8}-${uuid:8:4}-${uuid:12:4}-${uuid:16:4}-${uuid:20:12}
@@ -11,7 +12,9 @@ while ! grep NODENAME /etc/confluent/confluent.info; do
 done
 node=$(grep NODENAME: /etc/confluent/confluent.info|head -n 1|awk '{print $2}')
 mgr=$(grep MANAGER: /etc/confluent/confluent.info|head -n 1|awk '{print $2}')
-/opt/confluent/bin/clortho $node $mgr > /etc/confluent/confluent.apikey
+cp /opt/confluent/bin/clortho /clortho
+/clortho $node $mgr > /etc/confluent/confluent.apikey
+cat /tls/*.pem > /etc/confluent/ca.pem
 /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg
 profile=$(grep ^profile: /etc/confluent/confluent.deploycfg | sed -e 's/^profile: //')
 /opt/confluent/bin/apiclient /confluent-public/os/$profile/kickstart > /etc/confluent/ks.cfg
@@ -21,5 +24,4 @@ chmod +x /tmp/makeksnet
 rootpw=$(grep ^rootpassword: /etc/confluent/confluent.deploycfg|sed -e 's/^rootpassword: //')
 echo rootpw --iscrypted $rootpw > /tmp/rootpw
 export BOOT_OPTIONS=ks=/etc/confluent/ks.cfg
-exec /bin/install
-
+exec /bin/install
\ No newline at end of file
diff --git a/confluent_server/bin/osimage b/confluent_server/bin/osimage
index 9349c62a..e88a081c 100644
--- a/confluent_server/bin/osimage
+++ b/confluent_server/bin/osimage
@@ -138,7 +138,7 @@ def initialize(cmdset):
             sys.exit(1)
     os.rename(tmpname, '/var/lib/confluent/public/site/initramfs.cpio')
     tmptarname = tmpname.replace('cpio', 'tgz')
-    tarcmd = ['tar', '--transform=s|^|etc/|', '-czf', tmptarname] + topack
+    tarcmd = ['tar', '-czf', tmptarname] + topack
     subprocess.check_call(tarcmd)
     os.chdir(opath)
     os.rename(tmptarname, '/var/lib/confluent/public/site/initramfs.tgz')