[debian-edu-commits] debian-edu/ 01/01: Revert changes to ldap-tools/ldap-debian-edu-install; the reason for failing KDC setup inside d-i/target seems to be elsewhere.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 9cd26d375a818696f0134868a1b36c23b9d6fc95
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Aug 18 10:57:11 2016 +0200

    Revert changes to ldap-tools/ldap-debian-edu-install; the reason
    for failing KDC setup inside d-i/target seems to be elsewhere.
    
    This reverts commit 120c5b06c826b1fadb08812615edb125e4596479.
---
 debian/changelog                   | 3 ---
 ldap-tools/ldap-debian-edu-install | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9be46c..f1f5ffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,6 @@ debian-edu-config (1.908) UNRELEASED; urgency=medium
   * debian/debian-edu-config.postinst:
     - Add condition for removal of /etc/insserv/overrides/kdm.
     - Move upgrade related code from configure) to upgrade).
-  * ldap-tools/ldap-debian-edu-install: Remove condition to test if
-    /var/lib/ldap is empty as this might cause problems; init_ldap () is
-    cleaning it up anyway before LDAP is set up from scratch.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 15 Aug 2016 21:42:48 +0200
 
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index 3d1fc3d..0bc82c5 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -100,7 +100,7 @@ FIRSTUSERPWDHASH=$(slappasswd -s "$FIRSTUSERPWD" -h {SSHA})
 
 ## Make sure to ask for the password if it is not available
 if [ -f /etc/debian-edu/config ] && grep -q Main-Server /etc/debian-edu/config \
-    && [ -z "$ROOTPWDCLEAR" ]; then
+    && [ ! -f /var/lib/ldap/__db.001 ] && [ -z "$ROOTPWDCLEAR" ]; then
     loop=0
     while [ $loop -lt 50 ]; do
         loop=$(($loop+1))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git