diff options
| author | Jonathan Bauer | 2016-02-08 12:53:13 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2016-02-08 12:53:13 +0100 |
| commit | 5008c588afff6094f44d84cc4e3e00043cb06156 (patch) | |
| tree | 605518d8417edc548d0241d8eea9b39776463110 /remote/rootfs | |
| parent | [sssd] relax restart condition (diff) | |
| download | tm-scripts-5008c588afff6094f44d84cc4e3e00043cb06156.tar.gz tm-scripts-5008c588afff6094f44d84cc4e3e00043cb06156.tar.xz tm-scripts-5008c588afff6094f44d84cc4e3e00043cb06156.zip | |
[rfs-s31] do not copy /openslx-configs from the config.tgz if no SLX_LOCAL_CONFIG is set
Diffstat (limited to 'remote/rootfs')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 9837f150..c9b74791 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -67,7 +67,7 @@ HEREEND # 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 + 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}'" fi |