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

Proposed by Anders Kaseorg on 2011-09-15
Status: Merged
Merged at revision: 60
Proposed branch: lp:~andersk/ubuntu/oneiric/openssl/spurious-reboot
Merge into: lp:ubuntu/oneiric/openssl
Diff against target: 40 lines (+14/-6)
2 files modified
debian/changelog (+8/-0)
debian/libssl1.0.0.postinst (+6/-6)
To merge this branch: bzr merge lp:~andersk/ubuntu/oneiric/openssl/spurious-reboot
Reviewer Review Type Date Requested Status
Colin Watson 2011-09-15 Approve on 2011-10-04
Steve Beattie 2011-09-15 Pending
Ubuntu branches 2011-09-15 Pending
Review via email: mp+75645@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-14 22:06:03 +0000
3+++ debian/changelog 2011-09-15 22:31:25 +0000
4@@ -1,3 +1,11 @@
5+openssl (1.0.0e-2ubuntu2) oneiric; urgency=low
6+
7+ * Only issue a restart required notification on important upgrades, and
8+ not other actions such as reconfiguration or initial installation.
9+ (LP: #244250)
10+
11+ -- Anders Kaseorg <andersk@mit.edu> Thu, 15 Sep 2011 18:22:00 -0400
12+
13 openssl (1.0.0e-2ubuntu1) oneiric; urgency=low
14
15 * Resynchronise with Debian, fixes CVE-2011-1945, CVE-2011-3207 and
16
17=== modified file 'debian/libssl1.0.0.postinst'
18--- debian/libssl1.0.0.postinst 2011-09-14 22:06:03 +0000
19+++ debian/libssl1.0.0.postinst 2011-09-15 22:31:25 +0000
20@@ -166,14 +166,14 @@
21 # Shut down the frontend, to make sure none of the
22 # restarted services keep a connection open to it
23 db_stop
24+
25+ # Only issue the reboot notification for servers; we proxy this by
26+ # testing that the X server is not running (LP: #244250)
27+ if ! pidof /usr/bin/X > /dev/null && [ -x /usr/share/update-notifier/notify-reboot-required ]; then
28+ /usr/share/update-notifier/notify-reboot-required
29+ fi
30 fi # end upgrading and $2 lt 0.9.8c-2
31 fi # Upgrading
32-
33- # Only issue the reboot notification for servers; we proxy this by
34- # testing that the X server is not running (LP: #244250)
35- if ! pidof /usr/bin/X > /dev/null && [ -x /usr/share/update-notifier/notify-reboot-required ]; then
36- /usr/share/update-notifier/notify-reboot-required
37- fi
38 fi
39
40 #DEBHELPER#

Subscribers

People subscribed via source and target branches