diff options
| author | Simon Rettberg | 2016-04-11 18:34:12 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-04-11 18:34:12 +0200 |
| commit | 959efda2d781bb24e00b4b899bcbbf86f3c26cd6 (patch) | |
| tree | 272cf3cbed7e86872c87683d49242040f19b1004 /remote/rootfs | |
| parent | [config-fr] PVS: Three more manager IPS, more room corr. (-114 needs to (diff) | |
| download | tm-scripts-959efda2d781bb24e00b4b899bcbbf86f3c26cd6.tar.gz tm-scripts-959efda2d781bb24e00b4b899bcbbf86f3c26cd6.tar.xz tm-scripts-959efda2d781bb24e00b4b899bcbbf86f3c26cd6.zip | |
[rfs-stage31] Support multiple SLX_LOCAL_CONFIGs (space separated)
Diffstat (limited to 'remote/rootfs')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index c9b74791..135408f3 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -66,10 +66,15 @@ HEREEND cd "${TEMP_EXTRACT_DIR}" # 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 [ -n "${SLX_LOCAL_CONFIG}" -a -d "${LOCAL_CONFIG_DIR}" ]; then - tarcopy "${LOCAL_CONFIG_DIR}" "${TEMP_EXTRACT_DIR}" - echo "Merged local configuration files for '${SLX_LOCAL_CONFIG}'" + if [ -n "${SLX_LOCAL_CONFIG}" ]; then + local MOD + for MOD in ${SLX_LOCAL_CONFIG}; do + local LOCAL_CONFIG_DIR="openslx-configs/${MOD}" + if [ -d "${LOCAL_CONFIG_DIR}" ]; then + tarcopy "${LOCAL_CONFIG_DIR}" "${TEMP_EXTRACT_DIR}" + echo "Merged local configuration files for '${MOD}'" + fi + done fi # purge openslx-configs/* rm -rf -- "openslx-configs/" |