From ac606b131ff0d22616ace3cefaa98ce25a4fb738 Mon Sep 17 00:00:00 2001
From: Jannik Schönartz
Date: Tue, 6 Apr 2021 19:46:29 +0200
Subject: [bas-registration-hook] Export UUID for usage in reg. hooks and the
 script was an outdated version.

---
 modules.d/bas-registration-hooks/module-setup.sh   |  4 +--
 .../scripts/00_execute_hooks                       | 32 ---------------------
 .../scripts/execute_hooks.sh                       | 33 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 modules.d/bas-registration-hooks/scripts/00_execute_hooks
 create mode 100755 modules.d/bas-registration-hooks/scripts/execute_hooks.sh

diff --git a/modules.d/bas-registration-hooks/module-setup.sh b/modules.d/bas-registration-hooks/module-setup.sh
index 7f126441..a916a4b6 100755
--- a/modules.d/bas-registration-hooks/module-setup.sh
+++ b/modules.d/bas-registration-hooks/module-setup.sh
@@ -10,11 +10,11 @@ check() {
 	return 255
 }
 depends() {
-	: 
+	echo bas-python
 }
 install() {
 	# pre-mount is the first hook with guaranteed network access
-	inst_hook pre-mount 00 "$moddir/scripts/00_execute_hooks"
+	inst_hook pre-mount 00 "$moddir/scripts/execute_hooks.sh"
 	inst_multiple curl dmidecode
 	return 0
 }
diff --git a/modules.d/bas-registration-hooks/scripts/00_execute_hooks b/modules.d/bas-registration-hooks/scripts/00_execute_hooks
deleted file mode 100644
index 6f57545c..00000000
--- a/modules.d/bas-registration-hooks/scripts/00_execute_hooks
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-BAS=$(grep -oE 'bas=\S*' /proc/cmdline)
-BAS=${BAS#'bas='}
-export BAS
-UUID=$(dmidecode -q -s system-uuid)
-
-mkdir /tmp/nexthook
-cd /tmp/nexthook
-while true
-do
-	curl -s -D header -o script --insecure https://$BAS/api/registrations/$UUID/nexthook
-	if [ -s script ]
-	then
-		echo ""
-		if sh script
-		then
-			ID=$(grep -oE 'id:\s\S+' header)
-			ID=${ID#'id: '}
-			curl -s --data "id=$ID" --insecure https://$BAS/api/registrations/$UUID/success > /dev/null
-			echo ""
-			echo "Script with id $ID finished."
-			echo ""
-		fi
-	else
-		break
-	fi
-
-	drop_shell
-done
-
-reboot -f
diff --git a/modules.d/bas-registration-hooks/scripts/execute_hooks.sh b/modules.d/bas-registration-hooks/scripts/execute_hooks.sh
new file mode 100755
index 00000000..84273095
--- /dev/null
+++ b/modules.d/bas-registration-hooks/scripts/execute_hooks.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+BAS=$(grep -oE 'bas=\S*' /proc/cmdline)
+BAS=${BAS#'bas='}
+export BAS
+UUID=$(dmidecode -q -s system-uuid)
+export UUID
+
+mkdir /tmp/nexthook
+cd /tmp/nexthook
+while true
+do
+	curl -s -D header -o script --insecure https://$BAS/api/registration/$UUID/nexthook
+	if [ -s script ]
+	then
+		echo ""
+		if sh script
+		then
+			ID=$(grep -oE 'id:\s\S+' header)
+			ID=${ID#'id: '}
+			curl -s --data "id=$ID" --insecure https://$BAS/api/registration/$UUID/success > /dev/null
+			echo ""
+			echo "Script with id $ID finished."
+			echo ""
+		fi
+	else
+		break
+	fi
+
+	# emergency_shell
+done
+
+reboot -f
-- 
cgit v1.2.3-55-g7522