Skip to content

Commit 5fa33d1

Browse files
committed
Merge branch 'pieterlange-feature/mountedvolumes' into hotfix-1.1.3
2 parents cadabaf + 92dde39 commit 5fa33d1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

image/service/slapd/startup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
6060
# database and config directory are empty
6161
# setup bootstrap config - Part 1
6262
#
63-
if [ -z "$(ls -A /var/lib/ldap)" ] && [ -z "$(ls -A /etc/ldap/slapd.d)" ]; then
63+
if [ -z "$(ls -A -I lost+found /var/lib/ldap)" ] && [ -z "$(ls -A -I lost+found /etc/ldap/slapd.d)" ]; then
6464

6565
BOOTSTRAP=true
6666
log-helper info "Database and config directory are empty..."
@@ -87,7 +87,7 @@ EOF
8787
#
8888
# Error: the database directory (/var/lib/ldap) is empty but not the config directory (/etc/ldap/slapd.d)
8989
#
90-
elif [ -z "$(ls -A /var/lib/ldap)" ] && [ ! -z "$(ls -A /etc/ldap/slapd.d)" ]; then
90+
elif [ -z "$(ls -A -I lost+found /var/lib/ldap)" ] && [ ! -z "$(ls -A -I lost+found /etc/ldap/slapd.d)" ]; then
9191
log-helper error "Error: the database directory (/var/lib/ldap) is empty but not the config directory (/etc/ldap/slapd.d)"
9292
exit 1
9393

0 commit comments

Comments
 (0)