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, master has been updated via 2ad19f2b437c4373c0bfd688dee9ef85fe0ea480 (commit) from fed6d789e8d94e7145ba258f0f39f692ee87182f (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 2ad19f2b437c4373c0bfd688dee9ef85fe0ea480 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 20 20:38:42 2010 +0100

Fix klogd fails on xen-kernel.

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

Summary of changes: config/rootfiles/core/35/filelists/files | 1 + lfs/sysklogd | 1 + .../sysklogd-1.4.1_xen_empty_buffer_check.patch | 30 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 src/patches/sysklogd-1.4.1_xen_empty_buffer_check.patch

Difference in files: diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files index c9d1fa6..f4df303 100644 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@ -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 diff --git a/lfs/sysklogd b/lfs/sysklogd index 4c76283..9a4fda9 100644 --- a/lfs/sysklogd +++ b/lfs/sysklogd @@ -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} diff --git a/src/patches/sysklogd-1.4.1_xen_empty_buffer_check.patch b/src/patches/sysklogd-1.4.1_xen_empty_buffer_check.patch new file mode 100644 index 0000000..3aece3a --- /dev/null +++ b/src/patches/sysklogd-1.4.1_xen_empty_buffer_check.patch @@ -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();

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