webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-08 14:06:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Stefan Schantl
2015-05-04 20:15:24 +02:00
parent 359efc4bfd b59da37ee2
commit f63cb53f4a
4 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/squid
View File

@@ -34,7 +34,6 @@ usr/lib/squid/basic_smb_auth
usr/lib/squid/basic_smb_auth.sh usr/lib/squid/basic_smb_auth.sh
#usr/lib/squid/cachemgr.cgi #usr/lib/squid/cachemgr.cgi
usr/lib/squid/cert_tool usr/lib/squid/cert_tool
usr/lib/squid/cert_valid.pl
usr/lib/squid/digest_file_auth usr/lib/squid/digest_file_auth
usr/lib/squid/digest_ldap_auth usr/lib/squid/digest_ldap_auth
usr/lib/squid/diskd usr/lib/squid/diskd

1
config/rootfiles/core/90/filelists/fireinfo Symbolic link
View File

@@ -0,0 +1 @@
../../../common/fireinfo

1
lfs/fireinfo
View File

@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @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-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) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && ./configure --prefix=/usr

34
src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch Normal file
View File

@@ -0,0 +1,34 @@
From c667589410912ca980a78f417e86dd6585d58f9a Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@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