diff options
| author | Jonathan Bauer | 2014-06-26 17:03:27 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-06-26 17:03:27 +0200 |
| commit | 3b0e8463b67395d068e4c12b7830ba1bbc66298a (patch) | |
| tree | 051417311e930e305839da54dac5e016a7bee551 /remote | |
| parent | [opensbox] renamed openbox session name for better sorting in vmchooser (diff) | |
| download | tm-scripts-3b0e8463b67395d068e4c12b7830ba1bbc66298a.tar.gz tm-scripts-3b0e8463b67395d068e4c12b7830ba1bbc66298a.tar.xz tm-scripts-3b0e8463b67395d068e4c12b7830ba1bbc66298a.zip | |
[rfs-s32] fix addons downloading
Diffstat (limited to 'remote')
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons | 5 |
1 files changed, 2 insertions, 3 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 e6a1db6d..8d4d2d1a 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 @@ -27,11 +27,10 @@ export FUTURE_ROOT="/" # read openslx config, especially servers given by SLX_KCL_SERVERS and SLX_CONFIG_SERVERS 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." - [ -z "${SLX_KCL_SERVERS}" ] && SLX_KCL_SERVERS=$(read_from_cmdline "slxsrv") + #[ -z "${SLX_KCL_SERVERS}" ] && SLX_KCL_SERVERS=$(read_from_cmdline "slxsrv") fi # read base slx servers from cmdline -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; } @@ -58,7 +57,7 @@ if [ $# -eq 1 ]; then # download the addon from the given URL ADDON_TARGET_PATH="${DOWNLOAD_DEST}/$(basename "$ADDON").sqfs" - if ! download "${HTTP_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then + if ! download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then slxlog --echo "addon-download" "Download of '${HTTP_BASE_PATH}/${ADDON}.sqfs' failed." exit 1 fi |