← Back to branch summary

~serge-hallyn/ubuntu/natty/libvirt/libvirt-lxcguest

« back to all changes in this revision

Viewing changes to debian/libvirt-bin.upstart

https://launchpad.net/bugs/708172
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)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/libvirt-bin.upstart
7
7
expect daemon
8
8
respawn
9
9
 
 
10
env libvirtd_opts="-d"
 
11
env start_libvirtd="yes"
10
12
pre-start script
 
13
        [ -r /etc/default/libvirt-bin ] && . /etc/default/libvirt-bin
 
14
        [ ! "x$start_libvirtd" = "xyes" ] && { stop; exit 0; }
11
15
        mkdir -p /var/run/libvirt
12
16
        # Clean up a pidfile that might be left around
13
17
        rm -f /var/run/libvirtd.pid
15
19
 
16
20
# If you used to set $libvirtd_opts in /etc/default/libvirt-bin,
17
21
# change the 'exec' line here instead.
18
 
exec /usr/sbin/libvirtd -d
 
22
exec /usr/sbin/libvirtd $libvirtd_opts