[25555] in Source-Commits
/svn/athena r25082 - trunk/debathena/config/zephyr-config/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Mar 30 00:28:14 2011
Date: Wed, 30 Mar 2011 00:28:08 -0400
From: Benjamin Kaduk <kaduk@MIT.EDU>
Message-Id: <201103300428.p2U4S8m2022147@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: kaduk
Date: 2011-03-30 00:28:08 -0400 (Wed, 30 Mar 2011)
New Revision: 25082
Modified:
trunk/debathena/config/zephyr-config/debian/changelog
trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up
Log:
revert r25081
Modified: trunk/debathena/config/zephyr-config/debian/changelog
===================================================================
--- trunk/debathena/config/zephyr-config/debian/changelog 2011-03-30 04:17:37 UTC (rev 25081)
+++ trunk/debathena/config/zephyr-config/debian/changelog 2011-03-30 04:28:08 UTC (rev 25082)
@@ -1,11 +1,3 @@
-debathena-zephyr-config (1.10.1) unstable; urgency=low
-
- * In the if-up.d script, sleep before restarting, so as to have
- a reasonable chance of winning the race between the zhm initscript
- and the if-up.d script at boot.
-
- -- Benjamin Kaduk <kaduk@mit.edu> Wed, 30 Mar 2011 00:15:57 -0400
-
debathena-zephyr-config (1.10) unstable; urgency=low
* In the if-up.d script, restart instead of start, as the zhm
Modified: trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up
===================================================================
--- trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up 2011-03-30 04:17:37 UTC (rev 25081)
+++ trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up 2011-03-30 04:28:08 UTC (rev 25082)
@@ -2,7 +2,6 @@
case "$ADDRFAM" in
inet|NetworkManager)
- sleep 10
/etc/init.d/zhm restart >/dev/null 2>&1 || :
;;
esac
