From b8dcfbae45be8fc6fae9860009b9a0751ce5d5c4 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 12 Jun 2020 11:36:56 -0400 Subject: [PATCH] Move esxi customization back to include This makes modding the template a bit safer and more powerful. It seems it was incorrect that the issue in esxi6 was not due to %include and is just a fact of life. --- confluent_osdeploy/esxi7/profiles/hypervisor/kickstart | 2 ++ .../esxi7/profiles/hypervisor/scripts/modinstall | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart b/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart index 91823657..69b2dcfd 100644 --- a/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart +++ b/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart @@ -1,4 +1,6 @@ accepteula clearpart --firstdisk --overwritevmfs install --firstdisk --overwritevmfs +%include /tmp/ksnet +%include /tmp/rootpw reboot diff --git a/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/modinstall b/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/modinstall index 45c2a954..c3961abf 100644 --- a/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/modinstall +++ b/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/modinstall @@ -1,7 +1,7 @@ #!/bin/sh /opt/confluent/bin/apiclient /confluent-public/os/$profile/scripts/makeksnet >> /tmp/makeksnet chmod +x /tmp/makeksnet -/tmp/makeksnet >> /etc/confluent/ks.cfg +/tmp/makeksnet > /tmp/ksent rootpw=$(grep ^rootpassword: /etc/confluent/confluent.deploycfg|sed -e 's/^rootpassword: //') -echo rootpw --iscrypted $rootpw >> /etc/confluent/ks.cfg +echo rootpw --iscrypted $rootpw > /tmp/rootpw export BOOT_CMDLINE=ks=/etc/confluent/ks.cfg