From 38a4e20b9a93bdf6418b6dcd0d6dfa6c0b34b234 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 15 Jun 2021 08:31:45 -0400
Subject: [PATCH] Fix issues around imageboot and source in functions

---
 confluent_osdeploy/el7/profiles/default/scripts/functions       | 2 +-
 .../el8-diskless/profiles/default/scripts/functions             | 2 +-
 .../el8-diskless/profiles/default/scripts/imageboot.sh          | 2 +-
 confluent_osdeploy/el8/profiles/default/scripts/functions       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/confluent_osdeploy/el7/profiles/default/scripts/functions b/confluent_osdeploy/el7/profiles/default/scripts/functions
index c930044d..133e5306 100644
--- a/confluent_osdeploy/el7/profiles/default/scripts/functions
+++ b/confluent_osdeploy/el7/profiles/default/scripts/functions
@@ -51,7 +51,7 @@ source_remote() {
     chmod +x $1
     cmd=$1
     shift
-    source $cmd
+    source ./$cmd
     cd - > /dev/null
     return $retcode
 }
diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions b/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions
index 40fe2fa2..407b63ee 100644
--- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions
+++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/functions
@@ -59,7 +59,7 @@ source_remote() {
     chmod +x $1
     cmd=$1
     shift
-    source $cmd
+    source ./$cmd
     cd - > /dev/null
     return $retcode
 }
diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh
index 1e094e88..38415e4d 100644
--- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh
+++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh
@@ -1,6 +1,6 @@
 . /lib/dracut-lib.sh
 mkdir -p /mnt/remoteimg /mnt/remote /mnt/overlay
-if [ "unethered" = $(getarg confluent_imagemethod) ]; then
+if [ "unethered" = "$(getarg confluent_imagemethod)" ]; then
     mount -t tmpfs untethered /mnt/remoteimg
     curl https://$confluent_mgr/confluent-public/os/$confluent_profile/rootimg.sfs -O /mnt/remoteimg/rootimg.sfs
 else
diff --git a/confluent_osdeploy/el8/profiles/default/scripts/functions b/confluent_osdeploy/el8/profiles/default/scripts/functions
index c930044d..133e5306 100644
--- a/confluent_osdeploy/el8/profiles/default/scripts/functions
+++ b/confluent_osdeploy/el8/profiles/default/scripts/functions
@@ -51,7 +51,7 @@ source_remote() {
     chmod +x $1
     cmd=$1
     shift
-    source $cmd
+    source ./$cmd
     cd - > /dev/null
     return $retcode
 }