From: Michael Prokop <mika@grml.org>
Date: Sat, 17 May 2008 20:06:43 +0000 (+0200)
Subject: config_syslog(): support other syslog daemons than syslog-ng
X-Git-Tag: 0.8.6~1
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=103ba15615e67b8b391c3239c3b7363470728265

config_syslog(): support other syslog daemons than syslog-ng
---

diff --git a/autoconfig.functions b/autoconfig.functions
index c75b274..c5f23e7 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sat Mar 22 00:41:14 CET 2008 [mika]
+# Latest change: Sam Mai 17 22:04:08 CEST 2008 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -1612,11 +1612,22 @@ config_wondershaper(){
 # {{{ syslog-ng
 config_syslog(){
  if checkbootparam "nosyslog"; then
-  ewarn "Not starting syslog-ng as requested on boot commandline." ; eend 0
+    ewarn "Not starting syslog daemon as requested on boot commandline." ; eend 0
  else
-  einfo "Starting syslog-ng in background."
-  /etc/init.d/syslog-ng start 1>>$DEBUG &
-  eend 0
+    SYSLOGD=''
+    [ -x /etc/init.d/syslog-ng ] && SYSLOGD='syslog-ng'
+    [ -x /etc/init.d/rsyslog   ] && SYSLOGD='rsyslog'
+    [ -x /etc/init.d/dsyslog   ] && SYSLOGD='dsyslog'
+    [ -x /etc/init.d/sysklogd  ] && SYSLOGD='sysklogd'
+    [ -x /etc/init.d/inetutils-syslogd ] && SYSLOGD='inetutils-syslogd'
+
+    if [ -z "$SYSLOGD" ] ; then
+       eerror "No syslog daemon found." ; eend 1
+    else
+       einfo "Starting $SYSLOGD in background."
+       /etc/init.d/$SYSLOGD start 1>>$DEBUG &
+       eend 0
+    fi
  fi
 }
 # }}}
diff --git a/debian/changelog b/debian/changelog
index 7b38239..cfb13bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.8.6) unstable; urgency=low
+
+  * config_syslog(): support other syslog daemons than syslog-ng as well.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 17 May 2008 22:06:05 +0200
+
 grml-autoconfig (0.8.5) unstable; urgency=low
 
   * config_mypath(): allow setting additional $PATH via bootoption
diff --git a/debian/control b/debian/control
index f8b4208..5ddff96 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ XS-Vcs-Browser: http://hg.grml.org/grml-autoconfig/
 Package: grml-autoconfig
 Architecture: all
 Conflicts: grml-etc (<= 0.4-7)
-Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng, console-tools, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync
+Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng | system-log-daemon, console-tools, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync
 Recommends: acpi-support, hwinfo, alsa-utils, mdadm, powernowd, aumix, locales, grml2hd, grml-debootstrap (>= 0.7)
 Description: main bootup process of a grml system
  grml-autoconfig is the main part of the bootup process of the