Makefile

@@ -101,6 +101,8 @@ SYSCONFFILES = \
 	ldap/slapd-squeeze_debian-edu.conf \
 	ldap/ssl/slapd-cert.cnf \
 	ltsp/ltsp-build-client.conf \
+	network/if-up.d/hostname \
+	network/if-up.d/wpad-proxy-update \
 	samba/netlogon/1stlogon/1stlogon.bat \
 	samba/netlogon/config/get_time.bat \
 	samba/netlogon/config/penguin.bat \

debian/changelog

+debian-edu-config (2.10.43) UNRELEASED; urgency=medium
+
+  * Add etc/network/if-up.d/{hostname,wpad-proxy-update}. (Closes: #780461)
+    These scripts should make sure that hostname and wpad.dat changes take
+    effect immediately after reboot. The dhclient-exit hook scripts seem to be
+    executed only in the case of DHCP lease renewals which happen in intervalls
+    of random length (between 600 and 900 seconds).
+  * Adjust Makefile and debian/dirs to reflect the changes.
+  * Adjust share/ltsp/init-ltsp.d/60-edu-client:
+    - Ensure /etc/environment is set correctly on diskless workstations.
+  * debian/debian-edu-config.enable-nat:
+    - Adjust path to iptables binary (/sbin -> /usr/sbin). While Buster still
+      ships symlinks, those are planned to be removed in Bullseye.
+  * Fix incomplete sentence in previous changelog entry.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Sat, 27 Oct 2018 12:43:22 +0200
+
 debian-edu-config (2.10.42) unstable; urgency=medium
 
   [ Mike Gabriel ]
@@ -17,8 +34,8 @@ debian-edu-config (2.10.42) unstable; urgency=medium
     - Add share/ltsp/plugins/ltsp-build-client/Debian-custom/095-squashfs-image
       to enable setting it; see #904427 (LTSP) why this is needed.
     - Add etc/ltsp/ltsp-build-client.conf with settings for NFS.
-    - Adjust sbin/debian-edu-pxeinstall and accordingly to be able to use NFS on
-      the main network as well.
+    - Adjust sbin/debian-edu-pxeinstall and etc/debian-edu/pxeinstall.conf
+      accordingly to be able to use NFS on the main network as well.
     - Rework cf3/cf.homes:
       + Write /etc/export file with profile and architecture dependent values.
       + Drop no longer needed nfs-{common,kernel-server} configuration edits.

debian/debian-edu-config.enable-nat

@@ -12,7 +12,7 @@
 #                    sitting in the thin client network behind eth1
 ### END INIT INFO
 
-IPTABLES=/sbin/iptables
+IPTABLES=/usr/sbin/iptables
 
 NETWORK_TO_NAT=
 OUTSIDE_IF=eth0

debian/debian-edu-config.postinst

@@ -196,6 +196,10 @@ configure)
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf
 
+    # The scripts in /etc/network/if-up.d need to be executable.
+    chmod +x /etc/network/if-up.d/hostname
+    chmod +x /etc/network/if-up.d/wpad-proxy-update
+
     # silence dovecot's message: if you have trouble with authentication failures,
     # enable auth_debug setting. See http://wiki.dovecot.org/WhyDoesItNotWork
     # This message goes away after the first successful login.

debian/dirs

@@ -14,6 +14,7 @@ etc/init.d
 etc/ldap/schema
 etc/ldap/ssl
 etc/ltsp
+etc/network/if-up.d/
 etc/pam.d
 etc/slbackup/pre.d
 etc/samba

etc/network/if-up.d/hostname

+#!/bin/sh
+
+# Purpose: Used by dhclient-script to set the hostname of the system
+# to match the DNS information for the host as provided by DHCP.
+#
+# This script is based on code found on the web:
+# http://www.debian-administration.org/articles/447 and
+# http://nxhelp.com/blog/2013/01/24/automatically-set-hostname-from-dhcp/
+#
+
+PATH=/sbin:$PATH
+export PATH
+
+# Should not update hostname on Main-Server, Roaming-Workstation and
+# Standalone.  Those get their fixed hostname set during installation
+# (or manually after installation) and should not change dynamically
+# if moved between networks.
+if [ -r /etc/debian-edu/config ] ; then
+	. /etc/debian-edu/config
+fi
+
+if echo "$PROFILE" | egrep -q 'Main-Server|Roaming-Workstation|Standalone' ; then
+	exit 0
+	else
+	    if echo "$PROFILE" | egrep -q 'Workstation|LTSP-Server|Thin-Client-Server|Minimal' ; then
+	        :
+	    fi
+fi
+
+log() {
+    logger -t network/if-up.d/hostname "$1"
+}
+
+sethostname() {
+    hostname="$1"
+    namesource="$2"
+    echo $hostname > /etc/hostname
+    hostname $hostname
+    log "changing hostname to $hostname based on $namesource"
+}
+
+namesource="DHCP IP address $new_ip_address"
+/usr/sbin/update-hostname-from-ip

etc/network/if-up.d/wpad-proxy-update

+#!/bin/sh
+# Update proxy settings using wpad-url DHCP option or
+# http://wpad/wpad.dat when a DHCP update arrives
+
+if [ -r /etc/debian-edu/config ] ; then
+    . /etc/debian-edu/config
+fi
+
+if [ false = "$DHCP_WPAD_PROXY_UPDATE" ] ; then
+    exit 0
+fi
+
+/usr/share/debian-edu-config/tools/update-proxy-from-wpad

share/ltsp/init-ltsp.d/60-edu-client

@@ -31,6 +31,8 @@ fi
 if boolean_is_true "$LTSP_FATCLIENT" && [ -z "$DEFAULT_DISPLAY_MANAGER" ]; then
     # Remove autofs to let sshfs mount home dir (LDM is used).
     service_disable autofs
+    # Ensure /etc/environment is set correctly.
+    /usr/share/debian-edu-config/tools/update-proxy-from-wpad
 fi
 
 # Remove useless services for thin clients (in addition to LTSP defaults).