diff options
| author | Harald Hoyer <harald@redhat.com> | 2010-05-19 09:37:20 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2010-05-19 09:38:09 +0200 |
| commit | e54a84113ea8b08596070f87b81891f6cce9832e (patch) | |
| tree | ebc2126d6ac72970ed694cc3c962678bd4a79230 /modules.d/98syslog | |
| parent | 91d839409322180da37f49f18bd9a7b90219217e (diff) | |
| download | dracut-e54a84113ea8b08596070f87b81891f6cce9832e.tar.gz dracut-e54a84113ea8b08596070f87b81891f6cce9832e.tar.bz2 dracut-e54a84113ea8b08596070f87b81891f6cce9832e.zip | |
get rid of rdnetdebug
set PS4 and output to /dev/initlog.pipe
Diffstat (limited to 'modules.d/98syslog')
| -rwxr-xr-x | modules.d/98syslog/parse-syslog-opts.sh | 6 | ||||
| -rwxr-xr-x | modules.d/98syslog/rsyslogd-start.sh | 7 | ||||
| -rwxr-xr-x | modules.d/98syslog/syslog-cleanup.sh | 8 | ||||
| -rwxr-xr-x | modules.d/98syslog/syslog-genrules.sh | 6 |
4 files changed, 3 insertions, 24 deletions
diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh index 0ec3015d..438ab4b4 100755 --- a/modules.d/98syslog/parse-syslog-opts.sh +++ b/modules.d/98syslog/parse-syslog-opts.sh @@ -6,11 +6,7 @@ #sysloglevel=level What level has to be logged #syslogtype=rsyslog|syslog|syslogng # Don't auto detect syslog but set it -if getarg rdnetdebug ; then - exec >/tmp/syslog-parse-opts.$1.$$.out - exec 2>>/tmp/syslog-parse-opts.$1.$$.out - set -x -fi +. /lib/dracut-lib.sh syslogserver=$(getarg syslog) syslogfilters=$(getargs filter) diff --git a/modules.d/98syslog/rsyslogd-start.sh b/modules.d/98syslog/rsyslogd-start.sh index abab484b..4bfadc15 100755 --- a/modules.d/98syslog/rsyslogd-start.sh +++ b/modules.d/98syslog/rsyslogd-start.sh @@ -1,12 +1,7 @@ #!/bin/sh # Triggered by udev and starts rsyslogd with bootparameters -. /lib/dracut-lib.sh -if getarg rdnetdebug ; then - exec >/tmp/rsyslogd-start.$1.$$.out - exec 2>>/tmp/rsyslogd-start.$1.$$.out - set -x -fi +. /lib/dracut-lib.sh rsyslog_config() { local server=$1 diff --git a/modules.d/98syslog/syslog-cleanup.sh b/modules.d/98syslog/syslog-cleanup.sh index 8fdf21be..4e1c5314 100755 --- a/modules.d/98syslog/syslog-cleanup.sh +++ b/modules.d/98syslog/syslog-cleanup.sh @@ -1,13 +1,7 @@ #!/bin/sh # Just cleans up a previously started syslogd -. /lib/dracut-lib.sh - -if getarg rdnetdebug ; then - exec >/tmp/syslog-cleanup.$1.$$.out - exec 2>>/tmp/syslog-cleanup.$1.$$.out - set -x -fi +. /lib/dracut-lib.sh if [ -f /tmp/syslog.server ]; then read syslogtype < /tmp/syslog.type diff --git a/modules.d/98syslog/syslog-genrules.sh b/modules.d/98syslog/syslog-genrules.sh index 8d99fb8c..fb11f44b 100755 --- a/modules.d/98syslog/syslog-genrules.sh +++ b/modules.d/98syslog/syslog-genrules.sh @@ -17,12 +17,6 @@ detect_syslog() { [ -n "$syslogtype" ] } -if getarg rdnetdebug ; then - exec >/tmp/syslog-genrules.$1.$$.out - exec 2>>/tmp/syslog-genrules.$1.$$.out - set -x -fi - read syslogtype < /tmp/syslog.type if [ -z "$syslogtype" ]; then syslogtype=$(detect_syslog) |