Rename libvirt-bin.service back to libvirtd.service
and use symlink or Alias= instead. This is what upstream uses.
Closes: #730604
Laurent Bigonville authored 10 years ago
Guido Günther committed 10 years ago
| 4 | 4 |
Uploaders: Guido Günther <agx@sigxcpu.org>, Laurent Léonard <laurent@open-minds.org>
|
| 5 | 5 |
Build-Depends:
|
| 6 | 6 |
debhelper (>= 7),
|
| 7 | |
dh-systemd (>= 1.3),
|
|
7 |
dh-systemd (>= 1.18),
|
| 8 | 8 |
libxml2-dev,
|
| 9 | 9 |
libncurses5-dev,
|
| 10 | 10 |
libreadline-dev,
|
| 95 | 95 |
add_users_groups
|
| 96 | 96 |
add_statoverrides
|
| 97 | 97 |
|
|
98 |
# When renaming the .service file, systemd might become confused, we
|
|
99 |
# need to ensure that the libvirtd daemon is fully stopped before
|
|
100 |
# trying to restart it again. (Bug: #730604)
|
|
101 |
if dpkg --compare-versions "$2" le-nl "1.2.1-3~"; then
|
|
102 |
if [ -d /run/systemd/system ]; then
|
|
103 |
start-stop-daemon --stop --quiet --pidfile /var/run/libvirtd.pid \
|
|
104 |
--oknodo --exec /usr/sbin/libvirtd --retry 1
|
|
105 |
fi
|
|
106 |
# Remove everything we know about libvirt-bin.service
|
|
107 |
deb-systemd-helper purge libvirt-bin.service >/dev/null
|
|
108 |
fi
|
|
109 |
|
| 98 | 110 |
# Make sure the directories don't get removed on package removal since
|
| 99 | 111 |
# logrotate chokes otherwise.
|
| 100 | 112 |
for dir in qemu uml lxc; do
|
| 21 | 21 |
ExecReload=/bin/kill -HUP $MAINPID
|
| 22 | 22 |
KillMode=process
|
| 23 | 23 |
Restart=on-failure
|
| 24 | |
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
| 25 | |
index d8d7adf..e743edd 100644
|
| 26 | 24 |
--- a/tools/libvirt-guests.service.in
|
| 27 | 25 |
+++ b/tools/libvirt-guests.service.in
|
| 28 | |
@@ -1,11 +1,11 @@
|
| 29 | |
[Unit]
|
| 30 | |
Description=Suspend Active Libvirt Guests
|
| 31 | |
-After=network.target libvirtd.service
|
| 32 | |
+After=network.target libvirt-bin.service
|
| 33 | |
Documentation=man:libvirtd(8)
|
|
26 |
@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
|
| 34 | 27 |
Documentation=http://libvirt.org
|
| 35 | 28 |
|
| 36 | 29 |
[Service]
|
| 140 | 140 |
ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
|
| 141 | 141 |
# Linux supports more nice things:
|
| 142 | 142 |
dh_install -p libvirt-bin usr/lib/systemd/system lib/systemd/
|
| 143 | |
mv debian/libvirt-bin/lib/systemd/system/libvirtd.service \
|
| 144 | |
debian/libvirt-bin/lib/systemd/system/libvirt-bin.service
|
| 145 | 143 |
dh_install -p libvirt-bin usr/lib/libvirt/virt-aa-helper
|
| 146 | 144 |
dh_install -p libvirt-bin etc/apparmor.d
|
| 147 | 145 |
dh_install -p libvirt-bin usr/share/polkit-1
|