[debian-edu-commits] debian-edu/ 01/01: Drop bin/ltsp-arch-debian-edu and replace its last usage in debian-edu-config.postinst with $(dpkg --print-architecture).

[Holger Levsen]

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

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

commit 61f869b0ecd943833b15afc783052941e2012d97
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jan 29 00:51:20 2018 +0100

    Drop bin/ltsp-arch-debian-edu and replace its last usage in debian-edu-config.postinst with $(dpkg --print-architecture).
    
    I'm also not sure whether the surrounding code in postinst is sensible / still
    needed. It's definitly not sufficient (if needed) on systems with more than
    one LTSP arch…
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 Makefile                          | 1 -
 bin/ltsp-arch-debian-edu          | 9 ---------
 debian/changelog                  | 2 ++
 debian/debian-edu-config.postinst | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index c2936a5..da35f50 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ PACKAGE = debian-edu-config
 
 PROGS = \
 	debian-edu-ldapserver \
-	ltsp-arch-debian-edu \
 	update-ini-file
 
 SPROGS = debian-edu-fsautoresize \
diff --git a/bin/ltsp-arch-debian-edu b/bin/ltsp-arch-debian-edu
deleted file mode 100755
index 5876c3a..0000000
--- a/bin/ltsp-arch-debian-edu
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-LC_ALL=C
-export LC_ALL
-arch="$(/usr/bin/dpkg --print-architecture)"
-if [ 'amd64' = "$arch" ] ; then
-    /bin/echo i386
-else
-    echo "$arch"
-fi
diff --git a/debian/changelog b/debian/changelog
index 1ff0aad..772a14c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ debian-edu-config (2.10.20) UNRELEASED; urgency=medium
   * debian/control, thanks lintian:
     - remove duplicate depends on lsb-base.
     - Vcs-Git: use more secure URL.
+  * Drop bin/ltsp-arch-debian-edu and replace its last usage
+    debian-edu-config.postinst with $(dpkg --print-architecture).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 23 Jan 2018 15:00:57 +0100
 
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 1812d58..c20d305 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -233,7 +233,7 @@ fi
 
 # Make sure KDE screen unlocking work on diskless workstations
 # (Skolelinux bug #1415).
-ltsparch="$(ltsp-arch-debian-edu)"
+ltsparch="$(dpkg --print-architecture)"
 certfile="/opt/ltsp/$ltsparch/etc/ldap/ssl/ldap-server-pubkey.pem"
 if [ -f "$certfile" ] && [ 644 != "$(stat -c '%a' "$certfile")" ] ; then
     chmod 644 $certfile

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