diff options
| author | Simon Rettberg | 2013-12-18 18:15:07 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-12-18 18:15:07 +0100 |
| commit | 59d219f793735de9dcf318862c476c9d676fe03e (patch) | |
| tree | c61fbcddefd591c183b180f101393f775953f7f1 /remote/rootfs/rootfs-stage32/data | |
| parent | [rfs-stage32] More verbose error message if udhcpc fails (diff) | |
| parent | doc (diff) | |
| download | tm-scripts-59d219f793735de9dcf318862c476c9d676fe03e.tar.gz tm-scripts-59d219f793735de9dcf318862c476c9d676fe03e.tar.xz tm-scripts-59d219f793735de9dcf318862c476c9d676fe03e.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs/rootfs-stage32/data')
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons | 18 |
1 files 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; } |