[Pkg-libvirt-commits] [libvirt] 01/03: Rename the initscript and default file back to libvirtd

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch experimental
in repository libvirt.

commit 87f0e7cc876588a45034e1a43ee4f696d42659b6
Author: Laurent Bigonville <bigon at debian.org>
Date:   Mon May 12 08:50:53 2014 +0200

    Rename the initscript and default file back to libvirtd
    
    so we use the upstream name
    
    Closes: #730604
---
 debian/{libvirt-bin.default => libvirt-bin.libvirtd.default} | 2 +-
 debian/{libvirt-bin.init => libvirt-bin.libvirtd.init}       | 8 ++++----
 debian/libvirt-bin.postinst                                  | 2 +-
 debian/patches/debian/Debianize-libvirt-guests.patch         | 4 ++--
 debian/patches/debian/Debianize-systemd-service-files.patch  | 2 +-
 debian/patches/debian/remove-RHism.diff.patch                | 2 +-
 debian/rules                                                 | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/libvirt-bin.default b/debian/libvirt-bin.libvirtd.default
similarity index 86%
rename from debian/libvirt-bin.default
rename to debian/libvirt-bin.libvirtd.default
index e38a69c..042a541 100644
--- a/debian/libvirt-bin.default
+++ b/debian/libvirt-bin.libvirtd.default
@@ -1,4 +1,4 @@
-# Defaults for libvirt-bin initscript (/etc/init.d/libvirt-bin)
+# Defaults for libvirtd initscript (/etc/init.d/libvirtd)
 # This is a POSIX shell fragment
 
 # Start libvirtd to handle qemu/kvm:
diff --git a/debian/libvirt-bin.init b/debian/libvirt-bin.libvirtd.init
old mode 100755
new mode 100644
similarity index 97%
rename from debian/libvirt-bin.init
rename to debian/libvirt-bin.libvirtd.init
index 6552000..a2a8f56
--- a/debian/libvirt-bin.init
+++ b/debian/libvirt-bin.libvirtd.init
@@ -31,13 +31,13 @@ PIDFILE=/var/run/$NAME.pid
 DODTIME=1                   # Time to wait for the server to die, in seconds
 
 # Include libvirtd defaults if available
-if [ -f /etc/default/libvirt-bin ] ; then
-	. /etc/default/libvirt-bin
+if [ -f /etc/default/libvirtd ] ; then
+	. /etc/default/libvirtd
 fi
 
 check_start_libvirtd_option() {
   if [ ! "$start_libvirtd" = "yes" ]; then
-    log_warning_msg "Not starting libvirt management daemon libvirtd, disabled via /etc/default/libvirt-bin"
+    log_warning_msg "Not starting libvirt management daemon libvirtd, disabled via /etc/default/libvirtd"
     return 1
   else
     return 0
@@ -223,7 +223,7 @@ case "$1" in
 	fi
 	;;
   *)
-	N=/etc/init.d/libvirt-bin
+	N=/etc/init.d/libvirtd
 	echo "Usage: $N {start|stop|restart|reload|force-reload|status|force-stop}" >&2
 	exit 1
 	;;
diff --git a/debian/libvirt-bin.postinst b/debian/libvirt-bin.postinst
index 05c4638..4c11cb0 100644
--- a/debian/libvirt-bin.postinst
+++ b/debian/libvirt-bin.postinst
@@ -99,7 +99,7 @@ case "$1" in
 	# When renaming the .service file, systemd might become confused, we
 	# need to ensure that the libvirtd daemon is fully stopped before
 	# trying to restart it again. (Bug: #730604)
-	if dpkg --compare-versions "$2" le-nl "1.2.1-3~"; then
+	if dpkg --compare-versions "$2" le-nl "1.2.4"; then
 	    if [ -d /run/systemd/system ]; then
 	        start-stop-daemon --stop --quiet --pidfile /var/run/libvirtd.pid \
 		    --oknodo --exec /usr/sbin/libvirtd --retry 1
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index c6bef8a..128e7c9 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -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
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 87856d5..60729d2 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -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
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index f211595..4d4180d 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -15,7 +15,7 @@ index 02671b4..e721b35 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
diff --git a/debian/rules b/debian/rules
index 1f7c5f6..aec32e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -162,7 +162,7 @@ endif
 
 override_dh_installinit:
 	dh_systemd_enable
-	dh_installinit --name=libvirt-bin --restart-after-upgrade -- defaults 28 72
+	dh_installinit --name=libvirtd --restart-after-upgrade -- defaults 28 72
 	dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
 	dh_systemd_start --restart-after-upgrade
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git