diff options
| author | Jonathan Bauer | 2021-05-06 14:35:47 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2021-05-06 14:35:47 +0200 |
| commit | 3e2cb7c6c6fdad9496109baf15cde95b6ae0e7e7 (patch) | |
| tree | 96201228dbd1971317a19a5a46aa2e5f2be37ab5 | |
| parent | [slx-splash] inst_hook does not like <() (diff) | |
| download | systemd-init-3e2cb7c6c6fdad9496109baf15cde95b6ae0e7e7.tar.gz systemd-init-3e2cb7c6c6fdad9496109baf15cde95b6ae0e7e7.tar.xz systemd-init-3e2cb7c6c6fdad9496109baf15cde95b6ae0e7e7.zip | |
[slx-ssl] improve check for empty ssl dir
| -rw-r--r-- | modules.d/slx-ssl/hooks/setup-ssl-sat.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |