[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3943a54036fcce71d57b1bbd2c2759c64c5f1f86

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2356 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  3943a54036fcce71d57b1bbd2c2759c64c5f1f86 (commit)
      from  d996e17ab80ce674e3facc04aaa6e918e4d66fbb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3943a54036fcce71d57b1bbd2c2759c64c5f1f86
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date:   Fri Sep 2 20:35:23 2016 +0200

    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(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/libvirt                | 2 +-
 src/paks/libvirt/update.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/lfs/libvirt b/lfs/libvirt
index 6a28b7b..8ebca73 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 fd0ca97..ab57cbf 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
 


hooks/post-receive
--
IPFire 2.x development tree