From 5fb766e62b483e54b70d65f26112dbcc0ee8939b Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 3 Mar 2022 11:11:29 -0500
Subject: [PATCH] Move apiclient consistently to /opt/confluent/bin

It's more reasonable to have
it in a bin directory
---
 .../initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh   | 3 ++-
 .../initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh   | 3 ++-
 confluent_osdeploy/suse15/profiles/hpc/scripts/prechroot.sh    | 3 ++-
 .../ubuntu20.04/profiles/default/scripts/post.sh               | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/confluent_osdeploy/el7/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh b/confluent_osdeploy/el7/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
index 3b3e98da..d970f61c 100644
--- a/confluent_osdeploy/el7/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
+++ b/confluent_osdeploy/el7/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
@@ -18,4 +18,5 @@ mkdir -p /sysroot/etc/ssh/
 for i in /ssh/*.ca; do
     echo '@cert-authority *' $(cat $i) >> /sysroot/etc/ssh/ssh_known_hosts
 done
-cp /opt/confluent/bin/apiclient /sysroot/etc/confluent
+mkdir -p /sysroot/opt/confluent/bin
+cp /opt/confluent/bin/apiclient /sysroot/opt/confluent/bin
diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
index e62eb313..69a21e6f 100644
--- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
+++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
@@ -19,4 +19,5 @@ mkdir -p /sysroot/etc/ssh/
 for i in /ssh/*.ca; do
     echo '@cert-authority *' $(cat $i) >> /sysroot/etc/ssh/ssh_known_hosts
 done
-cp /opt/confluent/bin/apiclient /sysroot/etc/confluent
+mkdir -p /sysroot/opt/confuent/bin
+cp /opt/confluent/bin/apiclient /sysroot/opt/confluent/bin
diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/prechroot.sh b/confluent_osdeploy/suse15/profiles/hpc/scripts/prechroot.sh
index 7a3b0b63..f85b044d 100644
--- a/confluent_osdeploy/suse15/profiles/hpc/scripts/prechroot.sh
+++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/prechroot.sh
@@ -18,7 +18,8 @@ cp -a /tls/* /mnt/var/lib/ca-certificates/openssl
 cp -a /tls/* /mnt/var/lib/ca-certificates/pem
 cp -a /tls/*.pem /mnt/etc/pki/trust/anchors
 cat /tls/*.pem > /mnt/etc/confluent/ca.pem
-cp /opt/confluent/bin/apiclient /mnt/etc/confluent
+mkdir -p /mnt/opt/confluent/bin
+cp /opt/confluent/bin/apiclient /opt/confluent/bin/
 
 run_remote setupssh.sh
 
diff --git a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh
index 4b6d8934..6c99735c 100755
--- a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh
+++ b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/post.sh
@@ -49,8 +49,9 @@ fi
 mkdir -p /opt/confluent/bin
 mkdir -p /etc/confluent
 cp -a /target/etc/confluent/* /etc/confluent
+mkdir -p /target/opt/confluent/bin
 cp /custom-installation/confluent/bin/apiclient /opt/confluent/bin/
-cp /custom-installation/confluent/bin/apiclient /target/etc/confluent/
+cp /custom-installation/confluent/bin/apiclient /target/opt/confluent/bin
 
 mount -o bind /dev /target/dev
 mount -o bind /proc /target/proc