From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Fri, 15 Jul 2016 08:28:17 +0000 (+0200)
Subject: Fix in libvirt install.sh/uninstall.sh
X-Git-Tag: v2.19-core104~32
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=b61fe3f404035488e051929336d2b5159c8cb313

Fix in libvirt install.sh/uninstall.sh

The libvirt daemon was not started after installation because the
initscritp is named 'libvirtd' not like the package 'libvirt'.
The same problem appear in the uninstall.sh. The service was not
stopped.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/libvirt b/lfs/libvirt
index 5af28cb417..6768a72ace 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = libvirt
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "libpciaccess libyajl ncat qemu"
 
diff --git a/src/paks/libvirt/install.sh b/src/paks/libvirt/install.sh
index 2009b0ea93..c97a18defb 100644
--- a/src/paks/libvirt/install.sh
+++ b/src/paks/libvirt/install.sh
@@ -29,7 +29,7 @@ getent passwd libvirt-remote >/dev/null || \
 useradd -m -g libvirt-remote -s /bin/bash "libvirt-remote"
 
 extract_files
-start_service --delay 300 --background ${NAME}
+start_service --delay 300 --background libvirtd
 ln -svf /etc/init.d/libvirtd /etc/rc.d/rc0.d/K20libvirtd
 ln -svf /etc/init.d/libvirtd /etc/rc.d/rc3.d/S70libvirtd
 ln -svf /etc/init.d/libvirtd /etc/rc.d/rc6.d/K20libvirtd
diff --git a/src/paks/libvirt/uninstall.sh b/src/paks/libvirt/uninstall.sh
index a558460c1d..16dc724da9 100644
--- a/src/paks/libvirt/uninstall.sh
+++ b/src/paks/libvirt/uninstall.sh
@@ -22,7 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
+stop_service libvirtd
 remove_files
 
 rm -f /etc/rc.d/rc*.d/*libvirt-guests