[debian-edu-commits] r83676 - in branches/debian-edu-config/jessie: debian etc/dhcp/dhclient-exit-hooks.d

[pere at alioth.debian.org]

Author: pere
Date: 2014-08-19 10:47:49 +0000 (Tue, 19 Aug 2014)
New Revision: 83676

Modified:
   branches/debian-edu-config/jessie/debian/changelog
   branches/debian-edu-config/jessie/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert
Log:
Change dhcp exit hook fetch-ldap-cert to not try to call init.d/fetch-ldap-cert start before the network is up during boot, to avoid dependency loop when using systemd (Closes: #757767).

Modified: branches/debian-edu-config/jessie/debian/changelog
===================================================================
--- branches/debian-edu-config/jessie/debian/changelog	2014-08-19 10:46:01 UTC (rev 83675)
+++ branches/debian-edu-config/jessie/debian/changelog	2014-08-19 10:47:49 UTC (rev 83676)
@@ -2,6 +2,9 @@
 
   * Adjust network testsuite check to use new path to rpcinfo (Closes:
     #758190).
+  * Change dhcp exit hook fetch-ldap-cert to not try to call
+    init.d/fetch-ldap-cert start before the network is up during boot,
+    to avoid dependency loop when using systemd (Closes: #757767).
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 19 Aug 2014 12:39:05 +0200
 

Modified: branches/debian-edu-config/jessie/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert
===================================================================
--- branches/debian-edu-config/jessie/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert	2014-08-19 10:46:01 UTC (rev 83675)
+++ branches/debian-edu-config/jessie/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert	2014-08-19 10:47:49 UTC (rev 83676)
@@ -10,6 +10,12 @@
     exit 0
 fi
 
+# Avoid dependency loop by not calling init.d script when dhclient is
+# called by init.d/networking.  Workaround for BTS issue #754218.
+if [ -d /run/systemd/system ]; then
+    systemctl list-jobs | grep -q network.target && exit 0
+fi
+
 case $reason in
     BOUND|RENEW|REBIND|REBOOT)
 	/etc/init.d/fetch-ldap-cert start