[remote] Renamed functions to functions.inc; make setup-addons not fail if no addons are configured; try random server order when downloading

1 files changed, 6 insertions, 4 deletions

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
index a3350424..70a09924 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
@@ -6,12 +6,14 @@
 #
 #
 
-. /opt/openslx/etc/functions
+. /opt/openslx/config || { echo "Could not source config!"; exit 23; }
+[ -z "${SLX_ADDONS}" ] && { echo "No addons configured. Nothing to do :-)."; exit 0; }
+
+. /opt/openslx/etc/functions.inc || { echo "functions.inc not found!"; exit 1337; }
+
 export FUTURE_ROOT="/"
 
 # read openslx config
-. /opt/openslx/config
-[ -z "${SLX_ADDONS}" ] && { echo "SLX_ADDONS is not set in /opt/openslx/config." && exit 1; }
 if [ -z "${SLX_CONFIG_SERVERS}" ]; then
 	echo "SLX_CONFIG_SERVERS is not set in /opt/openslx/config. Will only try the base servers from the cmdline."
 	if [ -z "${SLX_KCL_SERVERS}" ]; then
@@ -31,7 +33,7 @@ for ADDON in ${SLX_ADDONS}; do
 	download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"
 
 	# now mount it to $SLX_MNT/<addon-name>
-	ADDON_MOUNT_POINT="${SLX_BASE_MNT}/$(basename $(echo ${ADDON})|awk -F "." '{print $1}')"
+	ADDON_MOUNT_POINT="${SLX_BASE_MNT}/$(basename $(echo ${ADDON}) | awk -F "." '{print $1}')"
 	mkdir -p "$ADDON_MOUNT_POINT"
 	echo "Mounting ${ADDON_TARGET_PATH} to ${ADDON_MOUNT_POINT}"
 	mount -t squashfs "$ADDON_TARGET_PATH" ${ADDON_MOUNT_POINT} || { echo "Failed to mount." && exit 1; }