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

diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files
index f4df3034a6e1ed1616a03139752665a4977d4741..988d2a2e71892b548faf31805d402c5ccc272aab 100644 (file)
--- 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 6eaf629d53e42c87a3d52f9ee6093c47af46574b..9d0da1097b4c062a67a208072b1ae1ab7a1cd864 100644 (file)
--- 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 29c1f9098624c4b6c8cd810fdf457dabba6d1719..0b7c273eb356872fed53c215a89d1b0c67b96399 100644 (file)
--- 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 7aa9a4c02f7dd6d05afce202b599b08b2c7d4b96..4482559b3beabff37a18f33b7029be1d798b762c 100644 (file)
--- 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 (executable)
new mode 100644 (file)