Ubuntu
libvirt package

Merge lp:~serge-hallyn/ubuntu/natty/libvirt/upstart-include-default into lp:ubuntu/natty/libvirt

  1. Natty (11.04)
  2. upstart-include-default
  3. Merge into natty
Proposed by Serge Hallyn
Status: Merged
Merged at revision: 112
Proposed branch: lp:~serge-hallyn/ubuntu/natty/libvirt/upstart-include-default
Merge into: lp:ubuntu/natty/libvirt
Diff against target: 38 lines (+14/-1)
2 files modified
debian/changelog (+9/-0)
debian/libvirt-bin.upstart (+5/-1)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/natty/libvirt/upstart-include-default
Reviewer Review Type Date Requested Status
Serge Hallyn (community) Needs Resubmitting
Clint Byrum (community) Needs Fixing
Ubuntu Sponsors Pending
Review via email: mp+47850@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Couple things that I think need fixing here:

I think it would be good to add a comment and changelog explanation that this is only there until there is a clear way for maintainer scripts to copy the /etc/default file in as an override in order to deprecate it.

You also need to set a default value for the options with this:

env libvirtd_options="-d"

So that the default file isn't needed at all anymore.

review: Needs Fixing
lp:~serge-hallyn/ubuntu/natty/libvirt/upstart-include-default updated
113. By Serge Hallyn

Address feedback from Clint.

Have upstart job source /etc/default/libvirt-bin. This is only a
temporary fix until upstart provides proper default override support
through /etc/init/libvirt-bin.override (or any other mechanism).
(LP: #708172)

Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

Thanks for the review, Clint. Feedback should be addressed now with the latest push.

review: Needs Resubmitting

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-01-04 14:16:29 +0000
3+++ debian/changelog 2011-01-31 13:56:26 +0000
4@@ -1,3 +1,12 @@
5+libvirt (0.8.5-0ubuntu5) natty; urgency=low
6+
7+ * Have upstart job source /etc/default/libvirt-bin. This is only a
8+ temporary fix until upstart provides proper default override support
9+ through /etc/init/libvirt-bin.override (or any other mechanism).
10+ (LP: #708172)
11+
12+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Thu, 27 Jan 2011 15:30:39 -0600
13+
14 libvirt (0.8.5-0ubuntu4) natty; urgency=low
15
16 * debian/apparmor/usr.sbin.libvirtd: use PUx instead of Ux for executables
17
18=== modified file 'debian/libvirt-bin.upstart'
19--- debian/libvirt-bin.upstart 2010-04-07 16:09:05 +0000
20+++ debian/libvirt-bin.upstart 2011-01-31 13:56:26 +0000
21@@ -7,7 +7,11 @@
22 expect daemon
23 respawn
24
25+env libvirtd_opts="-d"
26+env start_libvirtd="yes"
27 pre-start script
28+ [ -r /etc/default/libvirt-bin ] && . /etc/default/libvirt-bin
29+ [ ! "x$start_libvirtd" = "xyes" ] && { stop; exit 0; }
30 mkdir -p /var/run/libvirt
31 # Clean up a pidfile that might be left around
32 rm -f /var/run/libvirtd.pid
33@@ -15,4 +19,4 @@
34
35 # If you used to set $libvirtd_opts in /etc/default/libvirt-bin,
36 # change the 'exec' line here instead.
37-exec /usr/sbin/libvirtd -d
38+exec /usr/sbin/libvirtd $libvirtd_opts

Subscribers

People subscribed via source and target branches

to all changes: