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 3c68549f8c8f5246be8c403557b0505f634b7516 (commit) via 449749f1ef56fa7eb147f4637e867c6e076f21d7 (commit) from 9a6cf20c3d185435c674c9431ffeaf02b5ed7974 (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 3c68549f8c8f5246be8c403557b0505f634b7516 Merge: 449749f1ef56fa7eb147f4637e867c6e076f21d7 9a6cf20c3d185435c674c9431ffeaf02b5ed7974 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 23 12:11:34 2010 +0100

Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

commit 449749f1ef56fa7eb147f4637e867c6e076f21d7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 23 12:10:32 2010 +0100

Stop sysklogd for core35 update. Fix console-loglevel after klogd restart.

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

Summary of changes: config/rootfiles/core/35/filelists/files | 1 + config/rootfiles/core/35/update.sh | 4 ++-- doc/packages-list.txt | 2 +- src/initscripts/init.d/sysklogd | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) mode change 100755 => 100644 src/initscripts/init.d/watchdog

Difference in files: diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files index f4df303..988d2a2 100644 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@ -15,3 +15,4 @@ srv/web/ipfire/cgi-bin/outgoingfw.cgi var/ipfire/outgoing/bin/outgoingfw.pl usr/bin/squidGuard usr/sbin/klogd +etc/rc.d/init.d/sysklogd diff --git a/config/rootfiles/core/35/update.sh b/config/rootfiles/core/35/update.sh index 6eaf629..9d0da10 100644 --- a/config/rootfiles/core/35/update.sh +++ b/config/rootfiles/core/35/update.sh @@ -25,13 +25,13 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # #Stop services - +/etc/init.d/sysklogd stop # #Extract files extract_files # #Start services - +/etc/init.d/sysklogd start # #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 29c1f90..0b7c273 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -345,7 +345,7 @@ * v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire * v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire-xen * vdr-1.6.0 -* vdradmin-am-3.6.4 +* vdradmin-am-3.6.5 * vim-7.0 * vlan.1.9 * vlc-0.8.6i diff --git a/src/initscripts/init.d/sysklogd b/src/initscripts/init.d/sysklogd index 7aa9a4c..4482559 100644 --- a/src/initscripts/init.d/sysklogd +++ b/src/initscripts/init.d/sysklogd @@ -18,7 +18,7 @@ case "${1}" in start) boot_mesg "Starting kernel log daemon..." - loadproc klogd + loadproc klogd -c 1

boot_mesg "Starting system log daemon..." loadproc syslogd -m 0 diff --git a/src/initscripts/init.d/watchdog b/src/initscripts/init.d/watchdog old mode 100755 new mode 100644

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