From 6bcfaae3917d245305fbacbcf14dc5f8c967bd04 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:41:59 -0400
Subject: [PATCH] Remove extra final phase of boot checks

---
 templates/install.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/templates/install.sh b/templates/install.sh
index 5fbcb82..6d50841 100755
--- a/templates/install.sh
+++ b/templates/install.sh
@@ -863,11 +863,8 @@ host_ipaddr=\$( ip -br address show \${target_interface} | awk '{ print \$3 }' |
 bmc_macaddr=\$( ipmitool lan print | grep 'MAC Address  ' | awk '{ print \$NF }' )
 bmc_ipaddr=\$( ipmitool lan print | grep 'IP Address  ' | awk '{ print \$NF }' )
 
-if [[ -f /etc/pvc-install.hooks ]]; then
-    # The third boot, when all hooks have been completed
-    action="system-boot_completed"
-elif [[ -f /etc/pvc-install.base && -f /etc/pvc-install.pvc ]]; then
-    # The second boot, when Ansible has configured the cluster
+if [[ -f /etc/pvc-install.base && -f /etc/pvc-install.pvc ]]; then
+    # The second boot, after Ansible has configured the cluster
     action="system-boot_configured"
 else
     # The first boot, when Ansible has not been run yet
@@ -881,7 +878,7 @@ curl -X POST \
     -d "{\"action\":\"\${action}\",\"hostname\":\"\$( hostname -s )\",\"host_macaddr\":\"\${host_macaddr}\",\"host_ipaddr\":\"\${host_ipaddr}\",\"bmc_macaddr\":\"\${bmc_macaddr}\",\"bmc_ipaddr\":\"\${bmc_ipaddr}\"}" \
     \${pvcbootstrapd_checkin_uri}
 
-if [[ \${action} == "system-boot_completed" ]]; then
+if [[ \${action} == "system-boot_configured" ]]; then
     # Clean up the bootstrap interface and this script
     rm /etc/network/interfaces.d/\${target_interface}
     rm \$0