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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3204 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  afa91a4df5755569b91c87a6b3b6fae095529ed1 (commit)
      from  11e2e672e8cb351ca79418a518e726a83e30b15d (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 afa91a4df5755569b91c87a6b3b6fae095529ed1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon May 4 16:02:39 2015 +0200

    fireinfo: Fix SEGV on QEMU without KVM

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

Summary of changes:
 lfs/fireinfo                                       |  1 +
 ...-for-hypervisor-name-when-the-CPU-string-.patch | 34 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch

Difference in files:
diff --git a/lfs/fireinfo b/lfs/fireinfo
index e63bdc8..9d65765 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch
 
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure --prefix=/usr
diff --git a/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch b/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch
new file mode 100644
index 0000000..24a8ca1
--- /dev/null
+++ b/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch
@@ -0,0 +1,34 @@
+From c667589410912ca980a78f417e86dd6585d58f9a Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Mon, 4 May 2015 16:00:31 +0200
+Subject: [PATCH] Skip search for hypervisor name when the CPU string is empty
+
+---
+ src/_fireinfo/fireinfo.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/_fireinfo/fireinfo.c b/src/_fireinfo/fireinfo.c
+index fc639d9d4cd9..6601c21a733f 100644
+--- a/src/_fireinfo/fireinfo.c
++++ b/src/_fireinfo/fireinfo.c
+@@ -156,11 +156,12 @@ int detect_hypervisor(int *hypervisor) {
+ 
+ 		*hypervisor = HYPER_OTHER;
+ 
+-		int id;
+-		for (id = HYPER_NONE + 1; id < HYPER_LAST; id++) {
+-			if (strcmp(hypervisor_ids[id], sig.text) == 0) {
+-				*hypervisor = id;
+-				break;
++		if (*sig.text) {
++			for (int id = HYPER_NONE + 1; id < HYPER_LAST; id++) {
++				if (strcmp(hypervisor_ids[id], sig.text) == 0) {
++					*hypervisor = id;
++					break;
++				}
+ 			}
+ 		}
+ 
+-- 
+2.1.0
+


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