From 3e2cb7c6c6fdad9496109baf15cde95b6ae0e7e7 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 6 May 2021 14:35:47 +0200
Subject: [slx-ssl] improve check for empty ssl dir

---
 modules.d/slx-ssl/hooks/setup-ssl-sat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules.d/slx-ssl/hooks/setup-ssl-sat.sh b/modules.d/slx-ssl/hooks/setup-ssl-sat.sh
index c527eed5..d6fec336 100644
--- a/modules.d/slx-ssl/hooks/setup-ssl-sat.sh
+++ b/modules.d/slx-ssl/hooks/setup-ssl-sat.sh
@@ -12,7 +12,7 @@ CONFIG="${NEWROOT}/opt/openslx/config"
 # end dracut compat
 
 # Set up SSL communication with server
-if [ -d "${FUTURE_ROOT}/opt/openslx/ssl" ] && ! rmdir "${FUTURE_ROOT}/opt/openslx/ssl &> /dev/null"; then
+if [ -d "${FUTURE_ROOT}/opt/openslx/ssl" ] && [ -n "$(ls -A "${FUTURE_ROOT}/opt/openslx/ssl")" ]; then
 	# Copy certs and symlinks to CA path
 	cp -a "${FUTURE_ROOT}"/opt/openslx/ssl/* "${FUTURE_ROOT}/etc/ssl/certs/"
 	# Append to combined ca bundle
-- 
cgit v1.2.3-55-g7522