From a64e391944b334934ee3b2aec4f243f27baa7c15 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Mar 2019 14:40:04 +0100
Subject: [SS.S] Make bootup slx-admin trigger its own service

Having it as a cron entry makes it impossible to order
dependencies, like taskmanager, mariadb, etc.
---
 satellit_upgrader/pack-update.sh      | 3 ++-
 satellit_upgrader/updater.template.sh | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'satellit_upgrader')

diff --git a/satellit_upgrader/pack-update.sh b/satellit_upgrader/pack-update.sh
index a6aa75d..a485baf 100755
--- a/satellit_upgrader/pack-update.sh
+++ b/satellit_upgrader/pack-update.sh
@@ -206,9 +206,10 @@ if [ -z "$LEAN" ]; then
 	addinstallfile "slxadmin-config.php"
 	addinstallfile "slxadmin-cronscript"
 	addinstallfile "slxadmin-crontab"
+	addinstallfile "slxadmin-bootscript"
+	addinstallfile "slxadmin-boot.service"
 	addinstallfile "patch_lighttpd_phpchildren"
 
-	# Not quite ideal, watch out for similar names
 	addinstallfile "dnbd3/dnbd3-server.service"
 	addinstallfile "dnbd3/is-enabled"
 	addinstallfile "dnbd3/server.conf"
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 7a3322a..bfc434c 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -340,10 +340,14 @@ if [ -n "$TGZ_SLXADMIN" ]; then
 		echo "$TARGET_WEBIF_VERSION" > "${PATH_SLXADMIN}/version"
 		echo "Config updated"
 	fi
-	# New cronscript supplied
+	# New scripts supplied
 	diffcp "slxadmin-cronscript" "/opt/openslx/slxadmin-cronscript"
+	diffcp "slxadmin-bootscript" "/opt/openslx/slxadmin-bootscript"
 	# New crontab supplied
 	diffcp "slxadmin-crontab" "/etc/cron.d/slx-admin"
+	# Service
+	diffcp "slxadmin-boot.service" "/etc/systemd/system/slxadmin-boot.service"
+	ln -nfs "../slxadmin-boot.service" "/etc/systemd/system/multi-user.target.wants/slxadmin-boot.service"
 	# Ask about ipxe / pxelinux
 	if [ -z "$bootmodule" ] || ! [ -d "$PATH_SLXADMIN/modules-available/$bootmodule" ]; then
 		bootmodule="serversetup-bwlp-pxelinux"
-- 
cgit v1.2.3-55-g7522