From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Fri, 2 Sep 2016 18:35:23 +0000 (+0200)
Subject: Libvirt: Fix update.sh script
X-Git-Tag: v2.19-core106~102
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=3943a54036fcce71d57b1bbd2c2759c64c5f1f86

Libvirt: Fix update.sh script

The virtlogd could only be restarted when the daemons run. The update.sh
script tried to restart the daemon no matter if the daemons run or not.
This behaviour produce problems.

An If statement now checks if the daemon runs or not and execute the
command that is suitable for the situation.

Fixes: #11172

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 6a28b7b1ec..8ebca73fca 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    = 10
+PAK_VER    = 11
 
 DEPS       = "libpciaccess libyajl ncat qemu"
 
diff --git a/src/paks/libvirt/update.sh b/src/paks/libvirt/update.sh
index fd0ca9729b..ab57cbf627 100644
--- a/src/paks/libvirt/update.sh
+++ b/src/paks/libvirt/update.sh
@@ -63,7 +63,13 @@ chown -R nobody:kvm /var/lib/libvirt/images
 restore_backup ${NAME}
 
 #restart virtlogd to use the new version
+if [ -f "/var/run/virtlogd.pid" ]; then
+# the daemon runs restart him
 /etc/init.d/virtlogd restart
+else
+# the daemon runs not start him
+/etc/init.d/virtlogd start
+fi
 
 start_service --background libvirtd