diff options
| author | Michael Biebl <biebl@debian.org> | 2012-02-13 18:07:58 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-02-13 18:07:58 +0100 |
| commit | 55ddfa5fe218d33269ad1df9074c52015be85ced (patch) | |
| tree | 4e289fcbfbb805c3e264529eafb2c121b1489e44 /debian/rsyslog.init | |
| parent | a7caed21068d33c1b76a9383e723507a85611a66 (diff) | |
| download | rsyslog-55ddfa5fe218d33269ad1df9074c52015be85ced.tar.gz | |
Update init script for non-Linux systems
* debian/rsyslog.init
- Use --exec instead of --name for start-stop-daemon. This is more
reliable and works better on GNU/Hurd. (Closes: #652575)
- Use /run/xconsole and a symlink /dev/xconsole on non-Linux systems.
Diffstat (limited to 'debian/rsyslog.init')
| -rw-r--r-- | debian/rsyslog.init | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/rsyslog.init b/debian/rsyslog.init index 4566cf7..802fd61 100644 --- a/debian/rsyslog.init +++ b/debian/rsyslog.init @@ -52,30 +52,30 @@ do_start() do_stop() { - NAME="$RSYSLOGD" + DAEMON="$RSYSLOGD_BIN" PIDFILE="$RSYSLOGD_PIDFILE" # Return # 0 if daemon has been stopped # 1 if daemon was already stopped # other if daemon could not be stopped or a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON } # # Tell rsyslogd to close all open files # do_rotate() { - NAME="$RSYSLOGD" + DAEMON="$RSYSLOGD_BIN" PIDFILE="$RSYSLOGD_PIDFILE" - start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --name $NAME + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --exec $DAEMON } create_xconsole() { XCONSOLE=/dev/xconsole - if [ "$(uname -s)" = "GNU/kFreeBSD" ]; then - XCONSOLE=/var/run/xconsole + if [ "$(uname -s)" != "Linux" ]; then + XCONSOLE=/run/xconsole ln -sf $XCONSOLE /dev/xconsole fi if [ ! -e $XCONSOLE ]; then |