From 5008c588afff6094f44d84cc4e3e00043cb06156 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 8 Feb 2016 12:53:13 +0100
Subject: [rfs-s31] do not copy /openslx-configs from the config.tgz if no
 SLX_LOCAL_CONFIG is set

---
 remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote')

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
-- 
cgit v1.2.3-55-g7522