From 5f4ab5ff80ba7b4e95720a0babe0adf40ba72430 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 13 Mar 2023 16:21:25 -0400 Subject: [PATCH] Fix path to hmacfile Since we are running outside of chroot, need to adjust the $() substitution. --- .../ubuntu22.04/initramfs/scripts/casper-bottom/99confluent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/ubuntu22.04/initramfs/scripts/casper-bottom/99confluent b/confluent_osdeploy/ubuntu22.04/initramfs/scripts/casper-bottom/99confluent index 4f7a76c0..727693fa 100755 --- a/confluent_osdeploy/ubuntu22.04/initramfs/scripts/casper-bottom/99confluent +++ b/confluent_osdeploy/ubuntu22.04/initramfs/scripts/casper-bottom/99confluent @@ -13,14 +13,14 @@ oum=$(umask) umask 077 if [ -e /tmp/cnflnthmackeytmp ]; then hmackeyfile=/tmp/cnflnthmackeytmp - echo -n $(grep ^apitoken: /tmp/identdata/cnflnt.yml|awk '{print $2}') > $hmackeyfile + #echo -n $(grep ^apitoken: /tmp/identdata/cnflnt.yml|awk '{print $2}') > $hmackeyfile passfile=/tmp/cnflnttmppassfile passcrypt=/tmp/cnflntcryptfile hmacfile=/tmp/cnflnthmacfile chroot . ln -sf /custom-installation/confluent/bin/clortho custom-installation/confluent/bin/genpasshmac cp $hmackeyfile tmp chroot . custom-installation/confluent/bin/genpasshmac $passfile $passcrypt $hmacfile $hmackeyfile - chroot . curl -f -H "CONFLUENT_NODENAME: $NODENAME" -H "CONFLUENT_CRYPTHMAC: $(cat $hmacfile)" -d @/tmp/cnflntcryptfile https://$MGR/confluent-api/self/registerapikey + chroot . curl -f -H "CONFLUENT_NODENAME: $NODENAME" -H "CONFLUENT_CRYPTHMAC: $(cat /root/$hmacfile)" -d @/tmp/cnflntcryptfile https://$MGR/confluent-api/self/registerapikey else chroot . custom-installation/confluent/bin/clortho $NODENAME $MGR > /root/custom-installation/confluent/confluent.apikey MGR=[$MGR]