[Pkg-libvirt-commits] [libvirt] 01/01: /etc/init.d/libvirt-guests: source /lib/lsb/init-function

[Guido Guenther]

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

agx pushed a commit to branch master
in repository libvirt.

commit aa5cd1941e640cf16d16d30581c8c52d25b3f64a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Feb 16 16:32:47 2014 +0100

    /etc/init.d/libvirt-guests: source /lib/lsb/init-function
    
    This make sure we redirect calls to systemctl correctly
    
    Closes: #739082
    Thanks: Laurent Bigonville
---
 debian/patches/debian/Debianize-libvirt-guests.patch | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index dceb53a..877dc30 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -4,12 +4,12 @@ Subject: Debianize libvirt-guests
 
 Origin: vendor
 ---
- tools/libvirt-guests.sh.in   | 41 ++++++++++++++++++++++++-----------------
+ tools/libvirt-guests.sh.in   | 45 +++++++++++++++++++++++++++-----------------
  tools/libvirt-guests.sysconf |  4 ++--
- 2 files changed, 26 insertions(+), 19 deletions(-)
+ 2 files changed, 30 insertions(+), 19 deletions(-)
 
 diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 38e93c5..0f729be 100644
+index 38e93c5..7aa6eee 100644
 --- a/tools/libvirt-guests.sh.in
 +++ b/tools/libvirt-guests.sh.in
 @@ -1,5 +1,17 @@
@@ -31,7 +31,7 @@ index 38e93c5..0f729be 100644
  # Copyright (C) 2011-2013 Red Hat, Inc.
  #
  # This library is free software; you can redistribute it and/or
-@@ -16,33 +28,29 @@
+@@ -16,33 +28,33 @@
  # License along with this library.  If not, see
  # <http://www.gnu.org/licenses/>.
  
@@ -50,6 +50,10 @@ index 38e93c5..0f729be 100644
  # Make sure this file is recognized as having translations: _("dummy")
 -. "@bindir@"/gettext.sh
 +. /usr/bin/gettext.sh
++
++# Make sure calls to this script get redirected to systemctl when
++# using systemd
++. /lib/lsb/init-functions
  
 -export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@"
 +export TEXTDOMAIN="libvirt" TEXTDOMAINDIR="/usr/share/locale"
@@ -75,7 +79,7 @@ index 38e93c5..0f729be 100644
  
  RETVAL=0
  
-@@ -531,8 +539,7 @@ gueststatus() {
+@@ -531,8 +543,7 @@ gueststatus() {
  
  # rh_status
  # Display current status: whether saved state exists, and whether start

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