Merge branch 'bdurrow-patch-1' into hotfix-1.1.2

BertrandGouny · BertrandGouny · commit 6e94e75091a0 · 2016-03-18T10:09:13.000+01:00
diff --git a/image/service/slapd/startup.sh b/image/service/slapd/startup.sh
@@ -123,8 +123,10 @@ EOF
 
   # start OpenLDAP
   log-helper info "Start OpenLDAP..."
-  slapd -h "ldap://$HOSTNAME $PREVIOUS_HOSTNAME_PARAM ldap://localhost ldapi:///" -u openldap -g openldap
+  slapd -h "ldap://$HOSTNAME $PREVIOUS_HOSTNAME_PARAM ldap://localhost ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL &
 
+  log-helper info "Waiting for OpenLDAP to start..."
+  sleep 5
 
   #
   # setup bootstrap config - Part 2

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,10 @@ EOF`
`123`	`123`
`124`	`124`	`# start OpenLDAP`
`125`	`125`	`log-helper info "Start OpenLDAP..."`
`126`		`- slapd -h "ldap://$HOSTNAME $PREVIOUS_HOSTNAME_PARAM ldap://localhost ldapi:///" -u openldap -g openldap`
	`126`	`+ slapd -h "ldap://$HOSTNAME $PREVIOUS_HOSTNAME_PARAM ldap://localhost ldapi:///" -u openldap -g openldap -d $LDAP_LOG_LEVEL &`
`127`	`127`
	`128`	`+ log-helper info "Waiting for OpenLDAP to start..."`
	`129`	`+ sleep 5`
`128`	`130`
`129`	`131`	`#`
`130`	`132`	`# setup bootstrap config - Part 2`