webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix klogd fails on xen-kernel.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-01-20 20:38:42 +01:00
parent fed6d789e8
commit 2ad19f2b43
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/35/filelists/files
View File

@@ -14,3 +14,4 @@ lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off
srv/web/ipfire/cgi-bin/outgoingfw.cgi
var/ipfire/outgoing/bin/outgoingfw.pl
usr/bin/squidGuard
usr/sbin/klogd

1
lfs/sysklogd
View File

@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-8bit-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
touch /var/log/{dhcpcd.log,messages,ovpnserver.log}

30
src/patches/sysklogd-1.4.1_xen_empty_buffer_check.patch Normal file
View File

@@ -0,0 +1,30 @@
diff -Naur sysklogd-1.4.1.org/klogd.c sysklogd-1.4.1/klogd.c
--- sysklogd-1.4.1.org/klogd.c 2001-03-11 20:40:10.000000000 +0100
+++ sysklogd-1.4.1/klogd.c 2010-01-20 19:49:36.000000000 +0100
@@ -1171,10 +1171,24 @@
switch ( logsrc )
{
case kernel:
- LogKernelLine();
+ if (ksyslog(9, NULL, 0)>0)
+ {
+ LogKernelLine();
+ }
+ else
+ {
+ usleep(100000);
+ }
break;
case proc:
- LogProcLine();
+ if (ksyslog(9, NULL, 0)>0)
+ {
+ LogProcLine();
+ }
+ else
+ {
+ usleep(100000);
+ }
break;
case none:
pause();