[26730] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r25715 - trunk/debathena/config/dns-config/debian

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 8 12:27:22 2012

Date: Wed, 8 Aug 2012 12:27:20 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208081627.q78GRKSd018573@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-08-08 12:27:20 -0400 (Wed, 08 Aug 2012)
New Revision: 25715

Modified:
   trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst
Log:
Handle the case of dnsmasq already running

Modified: trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst
===================================================================
--- trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst	2012-08-08 14:27:35 UTC (rev 25714)
+++ trunk/debathena/config/dns-config/debian/debathena-dns-config.postinst	2012-08-08 16:27:20 UTC (rev 25715)
@@ -22,13 +22,10 @@
 
 case "$1" in
     configure)
-	if hash invoke-rc.d; then
-	    invoke-rc.d dnsmasq restart
-	    invoke-rc.d debathena-dns-config restart
-	else
-	    /etc/init.d/dnsmasq restart
-	    /etc/init.d/debathena-dns-config restart
-	fi
+	# Don't try to figure out what the network config is, because
+	# it's more complicated than we think.  Just reboot.
+        if [ -x /usr/share/update-notifier/notify-reboot-required ]; then
+            /usr/share/update-notifier/notify-reboot-required
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)


home help back first fref pref prev next nref lref last post