diff options
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 3295a92d..fc6b6ba0 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -63,18 +63,17 @@ HEREEND tar xf "${CONFIG}.tgz" -C "${TEMP_EXTRACT_DIR}" || { echo "Could not untar ${CONFIG}.tgz to ${TEMP_EXTRACT_DIR}"; return 1; } chown -R 0:0 "${TEMP_EXTRACT_DIR}" 2>/dev/null cd "${TEMP_EXTRACT_DIR}" - # first extract the common config files found in config.tgz:common/ - if [ -d "common" ]; then - tarcopy "common" "${FUTURE_ROOT}" - echo "Extracted common configuration files." - fi - # now extract the localized part of the config - # this should be under config.tgz:$SLX_LOCAL_CONFIG - # e.g. config.tgz:rzpool - if [ -d "${SLX_LOCAL_CONFIG}" ]; then - tarcopy "${SLX_LOCAL_CONFIG}" "${FUTURE_ROOT}" - echo "Extracted local configuration files for: $SLX_LOCAL_CONFIG" + # first we look for local config.tgz files, which we merge with the common + # config.tgz files + local LOCAL_CONFIG_DIR="openslx-configs/${SLX_LOCAL_CONFIG}" + if [ -d "${LOCAL_CONFIG_DIR}" ]; then + tarcopy "${LOCAL_CONFIG_DIR}" "${TEMP_EXTRACT_DIR}" + echo "Merged local configuration files for '${SLX_LOCAL_CONFIG}'" fi + # purge openslx-configs/* + rm -rf -- "openslx-configs/" + # now just tarcopy them to future root + tarcopy "${TEMP_EXTRACT_DIR}" "${FUTURE_ROOT}" # cleanup the downloaded stuff cd / rm -rf -- "${TEMP_EXTRACT_DIR}" |