[debian-edu-commits] debian-edu/ 02/15: Replace $LTSPARCH with actual arch during LDAP setup. (Closes: #888626).

[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 bb1d0dabbf255fbbeb0f4c269705f9cd0621ed97
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Feb 4 11:57:48 2018 +0100

    Replace $LTSPARCH with actual arch during LDAP setup. (Closes: #888626).
---
 ldap-tools/ldap-debian-edu-install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index ffb340d..2d9ffd0 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -296,6 +296,9 @@ init_ldap () {
   TEACHERSDN64=$(echo -n "$TEACHERSDN" | base64 -w0)
   MAC=$(lookup_mac_addrs|head -1)
 
+  ## Set LTSP chroot related DHCPD values (rootpath and filename):
+  LTSPARCH=$(/usr/bin/dpkg --print-architecture)
+
   ## query debconf data base for time zone and locale:
   AREA=`debconf-show tzdata | grep "^* tzdata/Areas:" | \
       sed "s/.*:[[:space:]]*\([[:alpha:]]*\)$/\1/"`
@@ -388,6 +391,7 @@ EOF
         -e "s:\$FIRSTUSERLASTNAME:$FIRSTUSERLASTNAME:" \
         -e "s:\$FIRSTUSERGIVENNAME:$FIRSTUSERGIVENNAME:" \
         -e "s:\$FIRSTUSERPWDHASH:$FIRSTUSERPWDHASH:" \
+        -e "s:\$LTSPARCH:$LTSPARCH:" \
 	  | /usr/sbin/slapadd ; then
 	  echo "info: added '$ldif' to ldap database."
       else

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