From 449749f1ef56fa7eb147f4637e867c6e076f21d7 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 23 Jan 2010 12:10:32 +0100
Subject: [PATCH] Stop sysklogd for core35 update. Fix console-loglevel after
 klogd restart.

---
 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 +-
 src/initscripts/init.d/watchdog          | 0
 5 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 src/initscripts/init.d/watchdog

diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files
index f4df3034a6..988d2a2e71 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 6eaf629d53..9d0da1097b 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 29c1f90986..0b7c273eb3 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 7aa9a4c02f..4482559b3b 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
-- 
2.39.2