diff --git a/image/service/slapd/startup.sh b/image/service/slapd/startup.sh index 1fb4a62..9f521a2 100755 --- a/image/service/slapd/startup.sh +++ b/image/service/slapd/startup.sh @@ -87,8 +87,8 @@ if [ ! -e "$FIRST_START_DONE" ]; then # database and config directory are empty # setup bootstrap config - Part 1 # - if [ -z "$(ls -A -I lost+found -I .rmtab -I .gitignore /var/lib/ldap)" ] && \ - [ -z "$(ls -A -I lost+found -I .rmtab -I .gitignore /etc/ldap/slapd.d)" ]; then + if [ -z "$(ls -A -I lost+found --ignore=.* /var/lib/ldap)" ] && \ + [ -z "$(ls -A -I lost+found --ignore=.* /etc/ldap/slapd.d)" ]; then BOOTSTRAP=true log-helper info "Database and config directory are empty..." @@ -133,14 +133,14 @@ EOF # # Error: the database directory (/var/lib/ldap) is empty but not the config directory (/etc/ldap/slapd.d) # - elif [ -z "$(ls -A -I lost+found -I .rmtab /var/lib/ldap)" ] && [ ! -z "$(ls -A -I lost+found -I .rmtab /etc/ldap/slapd.d)" ]; then + elif [ -z "$(ls -A -I lost+found --ignore=.* /var/lib/ldap)" ] && [ ! -z "$(ls -A -I lost+found --ignore=.* /etc/ldap/slapd.d)" ]; then log-helper error "Error: the database directory (/var/lib/ldap) is empty but not the config directory (/etc/ldap/slapd.d)" exit 1 # # Error: the config directory (/etc/ldap/slapd.d) is empty but not the database directory (/var/lib/ldap) # - elif [ ! -z "$(ls -A -I lost+found -I .rmtab /var/lib/ldap)" ] && [ -z "$(ls -A -I lost+found -I .rmtab /etc/ldap/slapd.d)" ]; then + elif [ ! -z "$(ls -A -I lost+found --ignore=.* /var/lib/ldap)" ] && [ -z "$(ls -A -I lost+found --ignore=.* /etc/ldap/slapd.d)" ]; then log-helper error "Error: the config directory (/etc/ldap/slapd.d) is empty but not the database directory (/var/lib/ldap)" exit 1