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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 3509 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  eb03f0178286ba0c049f4ef15b47d7e9ca60cc75 (commit)
       via  b61fe3f404035488e051929336d2b5159c8cb313 (commit)
      from  19a4317093718fc057d1a84d577593aaaee5c42e (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 eb03f0178286ba0c049f4ef15b47d7e9ca60cc75
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jul 15 09:55:49 2016 +0100

    Build bzip2 before pcre
    
    pcre is now depending on bzip2
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b61fe3f404035488e051929336d2b5159c8cb313
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date:   Fri Jul 15 10:28:17 2016 +0200

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

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

Summary of changes:
 lfs/libvirt                   | 2 +-
 make.sh                       | 2 +-
 src/paks/libvirt/install.sh   | 2 +-
 src/paks/libvirt/uninstall.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/lfs/libvirt b/lfs/libvirt
index 5af28cb..6768a72 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/make.sh b/make.sh
index 3d5b4a3..c6b1b5b 100755
--- a/make.sh
+++ b/make.sh
@@ -350,10 +350,10 @@ buildbase() {
     lfsmake2 perl
     lfsmake2 readline
     lfsmake2 readline-compat
+    lfsmake2 bzip2
     lfsmake2 pcre
     lfsmake2 pcre-compat
     lfsmake2 bash
-    lfsmake2 bzip2
     lfsmake2 diffutils
     lfsmake2 e2fsprogs
     lfsmake2 ed
diff --git a/src/paks/libvirt/install.sh b/src/paks/libvirt/install.sh
index 2009b0e..c97a18d 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 a558460..16dc724 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


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