From 02552a5d4af6218300149979e4968a8171fdc5b0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 23 Oct 2023 09:16:08 +0200
Subject: [SSPS] Cleanup

---
 satellit_installer/includes/99-end_message.inc | 14 --------------
 satellit_installer/satellit_installer          | 13 +++++++++----
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 satellit_installer/includes/99-end_message.inc

diff --git a/satellit_installer/includes/99-end_message.inc b/satellit_installer/includes/99-end_message.inc
deleted file mode 100644
index d9e8cc2..0000000
--- a/satellit_installer/includes/99-end_message.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-end_message() {
-	echo "#"
-	echo "# Now, as the first part of the setup went through, a little reminder may be in place:"
-	echo "#"
-	echo "# The second setup part will be started by a dropped script anchored in root's .bashrc."
-	echo "# To activate this script simply re-log in as root, or do a reboot. A reboot is not"
-	echo "# quite necessary but will do no harm either."
-	echo "#"
-	echo "# Keep in mind the mysql-passwords will be written in encrypted form to static_files"
-	echo "# directory (file: $BASEDIR/static_files/new_passwords.encrypted)."
-	echo "#"
-	echo "# And - have a nice day!"
-	echo
-}
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index 2a29cf4..9676f48 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -149,8 +149,9 @@ install_slxadmin_db
 # color prompt, aliases
 patch_bashrc
 
+# Empty tar file for slx-admin
 tar -z -c -T /dev/null -f /opt/openslx/empty.tgz
- 
+
 # Mark vmstore as not mounted
 touch "/srv/openslx/nfs/.notmounted"
 
@@ -159,7 +160,6 @@ write_versionstring
 
 # cleaning log files, authorized hosts, sources
 clean_install
-end_message
 
 # This part drops a script and anchors it's execution within root's .profile
 # Do this at the end so it's not there if something failed
@@ -170,8 +170,13 @@ finalize		# Cleaning script; finalize script will delete itself.
 [ "$NODELETE_SOURCE" != "true" ] && { echo "#"; echo "# Deleting source directory..."; rm -rf "$BASEDIR"; echo "# done."; } \
 				 || { echo "#"; echo "# Not deleting source directory; nodelete option was given."; }
 
-echo "Warte vor Beendigung auf eventuelle Hintergrundprozesse."
-echo "iPXE-Kompilationslog wurde nach /tmp/ipxesuccess geschrieben."
+echo "Power down the VM and the server is ready for distribution."
+echo "Do not login again or reboot the VM, as this will already trigger some scripts"
+echo "that are supposed to run at the customer's site."
+echo ""
+echo "Waiting for background processes (ipxe, ...)"
+echo "iPXE log will be written to /tmp/ipxesuccess."
 wait
+echo "Done."
 
 exit 0
-- 
cgit v1.2.3-55-g7522