Skip to content
Snippets Groups Projects
Commit bc785a7e authored by Guido Günther's avatar Guido Günther
Browse files

Drop left over libvirt-bin references

Fixes more leftovers of #730604
parent 7736353b
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@ Origin: vendor
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
index a158b62..62ee35f 100644
index 1b17bbe..0ee0210 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -1,5 +1,17 @@
......@@ -18,8 +18,8 @@ index a158b62..62ee35f 100644
+#
+### BEGIN INIT INFO
+# Provides: libvirt-guests
+# Required-Start: $remote_fs libvirt-bin
+# Required-Stop: $remote_fs libvirt-bin
+# Required-Start: $remote_fs libvirtd
+# Required-Stop: $remote_fs libvirtd
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: suspend/resume libvirt guests on shutdown/boot
......@@ -28,7 +28,7 @@ index a158b62..62ee35f 100644
+# See http://libvirt.org
+### END INIT INFO
+#
# Copyright (C) 2011-2013 Red Hat, Inc.
# Copyright (C) 2011-2014 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
@@ -16,23 +28,23 @@
......
......@@ -8,7 +8,7 @@ Subject: Debianize systemd service files
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
index 086da36..9bc433c 100644
index 086da36..a01e1b0 100644
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
@@ -15,8 +15,8 @@ Documentation=http://libvirt.org
......@@ -17,7 +17,7 @@ index 086da36..9bc433c 100644
Type=notify
-EnvironmentFile=-/etc/sysconfig/libvirtd
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
+EnvironmentFile=-/etc/default/libvirt-bin
+EnvironmentFile=-/etc/default/libvirtd
+ExecStart=@sbindir@/libvirtd $libvirtd_opts
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
......
......@@ -3,11 +3,12 @@ Date: Fri, 7 Mar 2008 09:08:25 +0100
Subject: remove-RHism.diff
---
tools/virsh.pod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
debian/patches/debian/remove-RHism.diff.patch | 2 +-
tools/virsh.pod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
index b248c9a..23186b1 100644
index 849ae31..8aa4b8a 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
......@@ -15,7 +16,7 @@ index b248c9a..23186b1 100644
Most B<virsh> operations rely upon the libvirt library being able to
connect to an already running libvirtd service. This can usually be
-done using the command B<service libvirtd start>.
+done using the command B<invoke-rc.d libvirt-bin start>.
+done using the command B<invoke-rc.d libvirtd start>.
Most B<virsh> commands require root privileges to run due to the
communications channels used to talk to the hypervisor. Running as
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment