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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 4211 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  6bc2225a5dc26c9de683c59dcdc1b92ff6ce3267 (commit)
       via  62be0cda19fe2a18b08141916f73ff8209ead737 (commit)
       via  0296bbea84ae3fc1d85d4b9249490c02f602b7ea (commit)
      from  bf8378e4b7593916b83fd5dfb517708bbdb67101 (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 6bc2225a5dc26c9de683c59dcdc1b92ff6ce3267
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date:   Sun Aug 14 11:25:01 2016 +0200

    Libvirt: load vhost_net before libvirtd start.
    
    If the  kernel module vhot_net is loaded, the performance of virtio
    networking is better then without vhost_net.
    So the module is loaded before libvirtd ist started to get the benefit
    of vhost_net.
    
    Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 62be0cda19fe2a18b08141916f73ff8209ead737
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date:   Sun Aug 14 11:10:36 2016 +0200

    Libvirt: fix configuration options
    
    Adds a missed - to -without-dbus and -with-interface.
    
    Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0296bbea84ae3fc1d85d4b9249490c02f602b7ea
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date:   Sun Aug 14 10:55:38 2016 +0200

    Libvirt: enable storage-fs
    
    Fixes: 11154
    
    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                     | 8 ++++----
 src/initscripts/init.d/libvirtd | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/lfs/libvirt b/lfs/libvirt
index ea8b0e8..854c52c 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    = 6
+PAK_VER    = 9
 
 DEPS       = "libpciaccess libyajl ncat qemu"
 
@@ -82,10 +82,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
 			--with-openssl --without-sasl \
 			--without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \
-			--without-firewalld --without-network -with-interface --with-virtualport --with-macvtap \
-			--disable-nls --without-avahi --without-test-suite -without-dbus \
+			--without-firewalld --without-network --with-interface --with-virtualport --with-macvtap \
+			--disable-nls --without-avahi --without-test-suite --without-dbus \
 			--with-qemu-user=nobody --with-qemu-group=kvm \
-			--with-storage-dir --without-storage-fs --without-storage-lvm  --without-storage-iscsi \
+			--with-storage-dir --with-storage-fs --without-storage-lvm  --without-storage-iscsi \
 			--without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster  --without-storage-zfs
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
diff --git a/src/initscripts/init.d/libvirtd b/src/initscripts/init.d/libvirtd
index f97d208..40bc6be 100644
--- a/src/initscripts/init.d/libvirtd
+++ b/src/initscripts/init.d/libvirtd
@@ -18,7 +18,7 @@
 case $1 in
 	start)
 		boot_mesg "Load required kernel modules for Libvirt"
-		modprobe tun
+		modprobe tun vhost_net
 		evaluate_retval
 		boot_mesg "Starting Libvirt Daemon..."
 		loadproc /usr/sbin/libvirtd -d


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