From cc8b3222125bca7944d0078f3d8761bcdecae15a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 17 Dec 2013 18:36:41 +0100
Subject: [rfs-stage32] Rename variables. SLX_ is reserved for
 /opt/openslx/config

---
 .../data/opt/openslx/scripts/systemd-setup_slx_addons  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 b6f25b65..f1253602 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
@@ -32,10 +32,10 @@ if [ -z "${SLX_CONFIG_SERVERS}" ]; then
 fi
 
 # read base slx servers from cmdline
-SLX_BASE_PATH=$(read_from_cmdline "slxbase")
-SLX_BASE_MNT="/opt/openslx/mnt"
-SYS_TMP="/tmp/addons"
-mkdir -p "$SYS_TMP" || { echo "Failed to create $SYS_TMP"; exit 1; }
+HTTP_BASE_PATH=$(read_from_cmdline "slxbase")
+BASE_MOUNT_POINT="/opt/openslx/mnt"
+DOWNLOAD_DEST="/tmp/addons"
+mkdir -p "$DOWNLOAD_DEST" || { echo "Failed to create $DOWNLOAD_DEST"; exit 1; }
 
 ######################################################################################
 #
@@ -61,14 +61,14 @@ if [ $# -eq 1 ]; then
 		{ echo "$ADDON is not listed in SLX_ADDONS of your config file. Skipping it."; exit 1; }
 
 	# download the addon from the given URL
-	ADDON_TARGET_PATH="${SYS_TMP}/$(basename "$ADDON").sqfs"
-	if ! download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then
-		slxlog --echo "addon-download" "Download of '${SLX_BASE_PATH}/${ADDON}.sqfs' failed."
+	ADDON_TARGET_PATH="${DOWNLOAD_DEST}/$(basename "$ADDON").sqfs"
+	if ! download "${HTTP_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then
+		slxlog --echo "addon-download" "Download of '${HTTP_BASE_PATH}/${ADDON}.sqfs' failed."
 		exit 1
 	fi
 
-	# now mount it to $SLX_MNT/<addon-name>
-	ADDON_MOUNT_POINT="${SLX_BASE_MNT}/$(basename "$ADDON")"
+	# now mount it to $BASE_MOUNT_POINT/<addon-name>
+	ADDON_MOUNT_POINT="${BASE_MOUNT_POINT}/$(basename "$ADDON")"
 	mkdir -p "$ADDON_MOUNT_POINT"
 	mount -t squashfs "$ADDON_TARGET_PATH" "$ADDON_MOUNT_POINT" || \
 		{ slxlog --echo "addon-mount" "Failed to mount $ADDON_TARGET_PATH."; exit 1; }
-- 
cgit v1.2.3-55-g7522