Merge lp:~andersk/ubuntu/oneiric/openssl/spurious-reboot into lp:ubuntu/oneiric/openssl

[Anders Kaseorg]

[Colin Watson (cjwatson)]

Agreed. It really doesn't make sense to issue the reboot-required notification when we aren't doing the whole restart-services dance.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-14 22:06:03 +0000
+++ debian/changelog	2011-09-15 22:31:25 +0000
@@ -1,3 +1,11 @@
+openssl (1.0.0e-2ubuntu2) oneiric; urgency=low
+
+  * Only issue a restart required notification on important upgrades, and
+    not other actions such as reconfiguration or initial installation.
+    (LP: #244250)
+
+ -- Anders Kaseorg <[e-mail]>  Thu, 15 Sep 2011 18:22:00 -0400
+
 openssl (1.0.0e-2ubuntu1) oneiric; urgency=low
 
   * Resynchronise with Debian, fixes CVE-2011-1945, CVE-2011-3207 and
 
=== modified file 'debian/libssl1.0.0.postinst'
--- debian/libssl1.0.0.postinst	2011-09-14 22:06:03 +0000
+++ debian/libssl1.0.0.postinst	2011-09-15 22:31:25 +0000
@@ -166,14 +166,14 @@
 	    # Shut down the frontend, to make sure none of the
 	    # restarted services keep a connection open to it
 	    db_stop
+
+	    # Only issue the reboot notification for servers; we proxy this by
+	    # testing that the X server is not running (LP: #244250)
+	    if ! pidof /usr/bin/X > /dev/null && [ -x /usr/share/update-notifier/notify-reboot-required ]; then
+		/usr/share/update-notifier/notify-reboot-required
+	    fi
 	fi # end upgrading and $2 lt 0.9.8c-2
     fi # Upgrading
-
-    # Only issue the reboot notification for servers; we proxy this by
-    # testing that the X server is not running (LP: #244250)
-    if ! pidof /usr/bin/X > /dev/null && [ -x /usr/share/update-notifier/notify-reboot-required ]; then
-    	/usr/share/update-notifier/notify-reboot-required
-    fi
 fi
 
 #DEBHELPER#