On Mon, 2008-12-22 at 16:03 +0100, Jiri Palecek > wrote: > Allow /usr/sbin/syslog-ng as path to syslog-ng, because this is the > path used in Debian syslog-ng packages > > Also, detect /sbin/rsyslogd as rsyslog, which is its location on > Fedora > > Signed-off-by: Jiri Palecek <[email protected]>
Thanks for the resend. Regards-- Subrata > --- > testcases/kernel/syscalls/syslog/syslog01 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog02 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog03 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog04 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog05 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog06 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog07 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog08 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog09 | 4 ++-- > testcases/kernel/syscalls/syslog/syslog10 | 4 ++-- > 10 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/testcases/kernel/syscalls/syslog/syslog01 > b/testcases/kernel/syscalls/syslog/syslog01 > index 53923a2..f1d6955 100755 > --- a/testcases/kernel/syscalls/syslog/syslog01 > +++ b/testcases/kernel/syscalls/syslog/syslog01 > @@ -89,11 +89,11 @@ syslog_case1() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" > diff --git a/testcases/kernel/syscalls/syslog/syslog02 > b/testcases/kernel/syscalls/syslog/syslog02 > index 49342b9..08225e9 100755 > --- a/testcases/kernel/syscalls/syslog/syslog02 > +++ b/testcases/kernel/syscalls/syslog/syslog02 > @@ -82,11 +82,11 @@ syslog_case2() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" > diff --git a/testcases/kernel/syscalls/syslog/syslog03 > b/testcases/kernel/syscalls/syslog/syslog03 > index 186f9ff..cf04382 100755 > --- a/testcases/kernel/syscalls/syslog/syslog03 > +++ b/testcases/kernel/syscalls/syslog/syslog03 > @@ -81,11 +81,11 @@ syslog_case3() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" > diff --git a/testcases/kernel/syscalls/syslog/syslog04 > b/testcases/kernel/syscalls/syslog/syslog04 > index b1d2d87..3eb2737 100755 > --- a/testcases/kernel/syscalls/syslog/syslog04 > +++ b/testcases/kernel/syscalls/syslog/syslog04 > @@ -76,11 +76,11 @@ syslog_case4() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" > diff --git a/testcases/kernel/syscalls/syslog/syslog05 > b/testcases/kernel/syscalls/syslog/syslog05 > index 0d3d8da..b223a08 100755 > --- a/testcases/kernel/syscalls/syslog/syslog05 > +++ b/testcases/kernel/syscalls/syslog/syslog05 > @@ -84,11 +84,11 @@ syslog_case5() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" > diff --git a/testcases/kernel/syscalls/syslog/syslog06 > b/testcases/kernel/syscalls/syslog/syslog06 > index 65aa48f..5b268d7 100755 > --- a/testcases/kernel/syscalls/syslog/syslog06 > +++ b/testcases/kernel/syscalls/syslog/syslog06 > @@ -87,11 +87,11 @@ syslog_case6() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" > diff --git a/testcases/kernel/syscalls/syslog/syslog07 > b/testcases/kernel/syscalls/syslog/syslog07 > index cac678e..6b99445 100755 > --- a/testcases/kernel/syscalls/syslog/syslog07 > +++ b/testcases/kernel/syscalls/syslog/syslog07 > @@ -90,12 +90,12 @@ syslog_case7() > syslog_cmd="/etc/init.d/sysklogd" > tst_resm TINFO "o Add lowest prority level i.e debug level entry > to" > tst_resm TINFO " configuration file." > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > tst_resm TINFO "o Ensure all priority levels can be logged" > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > tst_resm TINFO "o Add lowest prority level i.e debug level entry to" > tst_resm TINFO " configuration file." > diff --git a/testcases/kernel/syscalls/syslog/syslog08 > b/testcases/kernel/syscalls/syslog/syslog08 > index 6693d57..50d6455 100755 > --- a/testcases/kernel/syscalls/syslog/syslog08 > +++ b/testcases/kernel/syscalls/syslog/syslog08 > @@ -86,11 +86,11 @@ syslog_case8() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" > diff --git a/testcases/kernel/syscalls/syslog/syslog09 > b/testcases/kernel/syscalls/syslog/syslog09 > index 7fd7067..8afb8cb 100755 > --- a/testcases/kernel/syscalls/syslog/syslog09 > +++ b/testcases/kernel/syscalls/syslog/syslog09 > @@ -81,11 +81,11 @@ syslog_case9() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > tst_resm TINFO "using rsyslogd; you have to set it to compatibility > mode" > diff --git a/testcases/kernel/syscalls/syslog/syslog10 > b/testcases/kernel/syscalls/syslog/syslog10 > index 754b144..3890600 100755 > --- a/testcases/kernel/syscalls/syslog/syslog10 > +++ b/testcases/kernel/syscalls/syslog/syslog10 > @@ -84,11 +84,11 @@ syslog_case10() > then > CONFIG_FILE="/etc/syslog.conf" > syslog_cmd="/etc/init.d/sysklogd" > - elif [ -e /sbin/syslog-ng ] > + elif [ -e /sbin/syslog-ng ] || [ -e /usr/sbin/syslog-ng ] > then > CONFIG_FILE="/etc/syslog-ng/syslog-ng.conf" > syslog_cmd="/etc/init.d/syslog-ng" > - elif [ -e /usr/sbin/rsyslogd ] > + elif [ -e /sbin/rsyslogd ] || [ -e /usr/sbin/rsyslogd ] > then > CONFIG_FILE="/etc/rsyslog.conf" > syslog_cmd="/etc/init.d/rsyslog" ------------------------------------------------------------------------------ This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
