[debian-edu-commits] r81718 - in branches/wheezy/debian-edu-config: debian etc/NetworkManager/dispatcher.d etc/dhcp/dhclient-exit-hooks.d

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-18 08:55:28 +0000 (Thu, 18 Jul 2013)
New Revision: 81718

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/etc/NetworkManager/dispatcher.d/02debian-edu-config
   branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/hostname
Log:
Remove code in
/etc/NetworkManager/dispatcher.d/02debian-edu-config to update
hostname from DHCP, as it is redundant thanks to the code in
/etc/dhcp/dhclient-exit-hooks.d/hostname called by the
dispatcher.d script, and it was activated on roaming workstations
where it should be update the hostname.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-15 17:28:30 UTC (rev 81717)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-18 08:55:28 UTC (rev 81718)
@@ -7,6 +7,12 @@
   * Fix code avoiding several nbdswap-cleanup processes to run at
     once, making sure the script to not consider itself as a
     conflicting cleanup process (Closes: #662843).
+  * Remove code in
+    /etc/NetworkManager/dispatcher.d/02debian-edu-config to update
+    hostname from DHCP, as it is redundant thanks to the code in
+    /etc/dhcp/dhclient-exit-hooks.d/hostname called by the
+    dispatcher.d script, and it was activated on roaming workstations
+    where it should be update the hostname.
 
   [ Holger Levsen ]
   * debian/rules: stop calling (obsolete) dh_pysupport, we don't have any

Modified: branches/wheezy/debian-edu-config/etc/NetworkManager/dispatcher.d/02debian-edu-config
===================================================================
--- branches/wheezy/debian-edu-config/etc/NetworkManager/dispatcher.d/02debian-edu-config	2013-07-15 17:28:30 UTC (rev 81717)
+++ branches/wheezy/debian-edu-config/etc/NetworkManager/dispatcher.d/02debian-edu-config	2013-07-18 08:55:28 UTC (rev 81718)
@@ -36,26 +36,3 @@
 }
 
 run_dhclient_exit_hooks "$1" "$2"
-
-case "$2" in
-    up|vpn-up)
-	if [ -e /etc/debian-edu/config ] ; then
-	    . /etc/debian-edu/config
-	fi
-
-	# All profiles except Main-Server.  Listing them all to avoid
-	# activating this code unless some profile is defined in
-	# /etc/debian-edu/config.
-	if [ -n "$DHCP4_HOST_NAME" ] && \
-	    echo "$PROFILE" | egrep -q 'Workstation|Roaming-Workstation|Thin-Client-Server|Minimal|Standalone' ; then
-	    echo "$DHCP4_HOST_NAME" > /etc/hostname
-	    logger -t debian-edu-config "Update hostname from DHCP via NetworkManager to '$DHCP4_HOST_NAME'."
-	fi
-	;;
-    down|vpn-down|hostname)
-	;;
-    *)
-	echo "$0: called with unknown action \`$2'" 1>&2
-	exit 1
-	;;
-esac

Modified: branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/hostname
===================================================================
--- branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/hostname	2013-07-15 17:28:30 UTC (rev 81717)
+++ branches/wheezy/debian-edu-config/etc/dhcp/dhclient-exit-hooks.d/hostname	2013-07-18 08:55:28 UTC (rev 81718)
@@ -11,7 +11,10 @@
 PATH=/sbin:$PATH
 export PATH
 
-# Should not update hostname on Main-Server, Roaming-Workstation and Standalone
+# 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
 	case "$PROFILE" in