[debian-edu-commits] debian-edu/ 01/01: Adjust LTSP related configuration and scripts.

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Thu Dec 28 20:50:41 UTC 2017 

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 4dc894cdd2d1d42aa254f038809c43dad2b19885
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Dec 28 21:44:04 2017 +0100

    Adjust LTSP related configuration and scripts.
    
    Calling 'hostname -f' in share/ltsp/get-ldap-ltsp-config doesn't work at
    the time the script runs; replace it with LDAP query.
    
    Drop 'SWAP=Y' from ldap-bootstrap/ltsp.ldif because LTSP cares for it
    already depending on the client's amount of RAM.
    
    Replace ugly workaround 'share/ltsp/init-ltsp.d/70-edu-client-core' with
    'share/ltsp/init-ltsp.d/09-edu-ldap-config' to fetch configuration stored
    in LDAP.
    
    Drop superfluous shebang lines from all code snippets in
    ldap-bootstrap/ltsp.ldifand ship them as data files.
    
    Adjust Makefile and debian/debian-edu-config.postinst to reflect the
    changes.
    
    lintian-overrides:
    - Correct linenumber for "command-with-path-in-maintainer-script" for
      /usr/bin/etckeeper in postinst.
---
 Makefile                                   | 11 ++++++++---
 debian/changelog                           | 21 +++++++++++++++++----
 debian/debian-edu-config.lintian-overrides |  2 +-
 debian/debian-edu-config.postinst          |  5 +++++
 ldap-bootstrap/ltsp.ldif                   |  1 -
 share/ltsp/get-ldap-ltsp-config            |  3 ++-
 share/ltsp/init-ltsp.d/08-edu-hostname     |  2 --
 share/ltsp/init-ltsp.d/09-edu-ldap-config  | 10 ++++++++++
 share/ltsp/init-ltsp.d/60-edu-client       |  2 --
 share/ltsp/init-ltsp.d/70-edu-client-core  |  9 ---------
 10 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index fe74c5f..44762d1 100644
--- a/Makefile
+++ b/Makefile
@@ -397,14 +397,19 @@ install: install-testsuite
 		share/debian-edu-config/tools/exim4-create-environment \
 		share/debian-edu-config/ltspfs-mounter-kde \
 		share/ltsp/get-ldap-ltsp-config \
-		share/ltsp/init-ltsp.d/08-edu-hostname \
-		share/ltsp/init-ltsp.d/60-edu-client \
-		share/ltsp/init-ltsp.d/70-edu-client-core \
 		share/initramfs-tools/scripts/nfs-bottom/before-ltsp \
 	; do \
 		$(INSTALL) $$f $(DESTDIR)/usr/$$f ; \
 	done
 
+	set -e ; for f in \
+		share/ltsp/init-ltsp.d/08-edu-hostname \
+		share/ltsp/init-ltsp.d/09-edu-ldap-config \
+		share/ltsp/init-ltsp.d/60-edu-client \
+	; do \
+		$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
+	done
+
 	set -e ; for f in share/debian-edu/common/share/config/kcookiejarrc \
 		share/debian-edu/common/share/apps/kicker/default-apps \
 		share/debian-edu/common/share/config/artsmessagerc \
diff --git a/debian/changelog b/debian/changelog
index 21a0873..9eb18ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,24 @@ debian-edu-config (1.943) UNRELEASED; urgency=medium
 
   * Adjust LTSP related configuration and scripts to work with ltsp 5.5.10:
     - Replace /var/cache/ltsp with /run/ltsp in share/ltsp/get-ldap-ltsp-config
-      and share/ltsp/init-ltsp.d/70-edu-client-core because lts.conf is now
-      generated in /run/ltsp.
+      and because lts.conf is now generated in /run/ltsp.
+    - Calling 'hostname -f' in share/ltsp/get-ldap-ltsp-config doesn't work at
+      the time the script runs; replace it with LDAP query.
     - Add new lts.conf variable TIMESERVER to ldap-bootstrap/ltsp.ldif; using
-      TIMESERVER=ntp will allow to drop ntp.conf modification for class
-      'ltspclient' during installation.
+      TIMESERVER=ntp will allow one to drop ntp.conf modification for class
+      'ltspclient' during installation. Drop 'SWAP=Y' because LTSP cares for it
+      already depending on the client's amount of RAM.
+    - Replace ugly workaround 'share/ltsp/init-ltsp.d/70-edu-client-core' with
+      'share/ltsp/init-ltsp.d/09-edu-ldap-config' to fetch configuration stored
+      in LDAP.
+  * share/ltsp/init-ltsp.d:
+    - Drop superfluous shebang lines from all code snippets and ship them as
+      data files.
+  * Adjust Makefile and debian/debian-edu-config.postinst to reflect the
+    changes.
+  * lintian-overrides:
+    - Correct linenumber for "command-with-path-in-maintainer-script" for
+      /usr/bin/etckeeper in postinst.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 27 Dec 2017 11:00:23 +0100
 
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index b3c4a19..43ee22a 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -3,7 +3,7 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/f
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/hostname
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
 debian-edu-config binary: command-with-path-in-maintainer-script postinst:51 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:264 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:269 /usr/bin/etckeeper
 debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
 debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 63a2e4c..b8abb3c 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -157,6 +157,11 @@ configure)
         fi
     fi
 
+    if dpkg --compare-versions "$2" le "1.942" && \
+        [ -f /usr/share/ltsp/init-ltsp.d/70-edu-client-core ] ; then
+	rm /usr/share/ltsp/init-ltsp.d/70-edu-client-core
+    fi
+
     if dpkg --compare-versions "$2" le "1.929" && dpkg --compare-versions "$2" ge "1.926" && \
         egrep -q "(Main-Server)" /etc/debian-edu/config ; then
 	rm /etc/apache2/mods-available/userdir.load
diff --git a/ldap-bootstrap/ltsp.ldif b/ldap-bootstrap/ltsp.ldif
index f0919cb..b1f55a1 100644
--- a/ldap-bootstrap/ltsp.ldif
+++ b/ldap-bootstrap/ltsp.ldif
@@ -6,6 +6,5 @@ ou: ltsp
 dn: cn=ltspConfigDefault,ou=ltsp,dc=skole,dc=skolelinux,dc=no
 objectclass: ltspClientConfig
 cn: ltspConfigDefault
-ltspConfig: NBD_SWAP=Y
 ltspConfig: KEEP_SYSTEM_SERVICES=lightdm
 ltspConfig: TIMESERVER=ntp
diff --git a/share/ltsp/get-ldap-ltsp-config b/share/ltsp/get-ldap-ltsp-config
index 70e3476..d3f8676 100755
--- a/share/ltsp/get-ldap-ltsp-config
+++ b/share/ltsp/get-ldap-ltsp-config
@@ -71,6 +71,7 @@ echo "Fetching ltsp config from ldap"
 cachefile=/run/ltsp/ltsp_config_edu
 envfile=/run/ltsp/ltsp_config_env
 PATH=/bin:/usr/bin:/usr/sbin
+HOSTNAME=$(/usr/sbin/update-hostname-from-ip -m -n)
 
 setup_from_ldap() {
     filter="(&(ltspConfig=*)$1)"
@@ -115,7 +116,7 @@ if touch $cachefile && touch $envfile; then
             # If the HW MAC address was not found, look for the host name
             # instead.
             if [ false = "$foundinldap" ] ; then
-                fqdn=$(hostname -f)
+                fqdn="$HOSTNAME"
                 # No use checking if it isn't set up yet
                 if [ "(none)" != "$fqdn" ] ; then
                     setup_from_ldap "(associatedDomain=$fqdn)"
diff --git a/share/ltsp/init-ltsp.d/08-edu-hostname b/share/ltsp/init-ltsp.d/08-edu-hostname
index f3a8633..1bfdec1 100644
--- a/share/ltsp/init-ltsp.d/08-edu-hostname
+++ b/share/ltsp/init-ltsp.d/08-edu-hostname
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 # Reorder scripts to make sure host name setting can use DNS lookup
 dnsinit=/usr/share/ltsp/init-ltsp.d/10-resolv-conf
 if [ -e $dnsinit ] ; then
diff --git a/share/ltsp/init-ltsp.d/09-edu-ldap-config b/share/ltsp/init-ltsp.d/09-edu-ldap-config
new file mode 100644
index 0000000..36bdc5f
--- /dev/null
+++ b/share/ltsp/init-ltsp.d/09-edu-ldap-config
@@ -0,0 +1,10 @@
+# Get LTSP configuration from LDAP into the client start environment.
+if [ ! -d /run/ltsp ] ; then
+mkdir -p /run/ltsp
+fi
+
+if [ -x /usr/share/ltsp/get-ldap-ltsp-config ] ; then
+/usr/share/ltsp/get-ldap-ltsp-config
+fi
+cat /run/ltsp/ltsp_config_edu >> /run/ltsp/ltsp_config_env
+. /usr/share/ltsp/ltsp_config
diff --git a/share/ltsp/init-ltsp.d/60-edu-client b/share/ltsp/init-ltsp.d/60-edu-client
index 74964f0..1795ed5 100644
--- a/share/ltsp/init-ltsp.d/60-edu-client
+++ b/share/ltsp/init-ltsp.d/60-edu-client
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 service_disable() {
     service="$1"
     if [ systemd = "$BOOTSYSTEM" ] \
diff --git a/share/ltsp/init-ltsp.d/70-edu-client-core b/share/ltsp/init-ltsp.d/70-edu-client-core
deleted file mode 100644
index 1efe61a..0000000
--- a/share/ltsp/init-ltsp.d/70-edu-client-core
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# This snippet modifies /etc/init.d/ltsp-client-core on-the-fly.
-#
-# Get config stored in LDAP for Debian Edu ltsp clients (thin and fat).
-#
-sed -i '/"Starting\ LTSP\ client..."/ a\
-        /usr/share/ltsp/get-ldap-ltsp-config\
-        cat /run/ltsp/ltsp_config_edu >> /run/ltsp/ltsp_config_env\
-        ' /etc/init.d/ltsp-client-core

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

More information about the debian-edu-commits mailing list