On Wed, 2009-01-21 at 13:10 +0100, Jiri Palecek wrote:
> This adds the configuration directive
>
> $ModLoad imuxsock.so
>
> to the beginning of the syslog configuration file when using rsyslog.
>
> Signed-off-by: Jiri Palecek <[email protected]>
Thanks.
Regards--
Subrata
> ---
> testcases/kernel/syscalls/syslog/syslog01 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog02 | 4 +++-
> testcases/kernel/syscalls/syslog/syslog03 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog04 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog05 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog06 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog07 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog08 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog09 | 6 ++++--
> testcases/kernel/syscalls/syslog/syslog10 | 6 ++++--
> 10 files changed, 39 insertions(+), 19 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/syslog/syslog01
> b/testcases/kernel/syscalls/syslog/syslog01
> index 46d880c..b33eb30 100755
> --- a/testcases/kernel/syscalls/syslog/syslog01
> +++ b/testcases/kernel/syscalls/syslog/syslog01
> @@ -74,6 +74,7 @@ syslog_case1()
>
>
> RC=0
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -97,7 +98,7 @@ syslog_case1()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -143,7 +144,8 @@ syslog_case1()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "*.crit
> /var/log/messages" > $CONFIG_FILE
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "*.crit
> /var/log/messages" >> $CONFIG_FILE
> echo "mail.info /var/log/maillog" >>
> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> diff --git a/testcases/kernel/syscalls/syslog/syslog02
> b/testcases/kernel/syscalls/syslog/syslog02
> index 4a8529f..007750d 100755
> --- a/testcases/kernel/syscalls/syslog/syslog02
> +++ b/testcases/kernel/syscalls/syslog/syslog02
> @@ -62,6 +62,7 @@ exit $status_flag
>
> syslog_case2()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -90,7 +91,7 @@ syslog_case2()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -139,6 +140,7 @@ syslog_case2()
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> # Create the configuration file specific to this level
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> echo "mail.$current /var/log/maillog" >>
> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> diff --git a/testcases/kernel/syscalls/syslog/syslog03
> b/testcases/kernel/syscalls/syslog/syslog03
> index cf04382..c92503f 100755
> --- a/testcases/kernel/syscalls/syslog/syslog03
> +++ b/testcases/kernel/syscalls/syslog/syslog03
> @@ -64,6 +64,7 @@ exit $status_flag
>
> syslog_case3()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -89,7 +90,7 @@ syslog_case3()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -133,7 +134,8 @@ syslog_case3()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "daemon.info /var/log/messages" >
> $CONFIG_FILE;;
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "daemon.info /var/log/messages" >>
> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> echo "source src{ internal(); unix-dgram(\"/dev/log\");
> \
> diff --git a/testcases/kernel/syscalls/syslog/syslog04
> b/testcases/kernel/syscalls/syslog/syslog04
> index 3eb2737..a31d301 100755
> --- a/testcases/kernel/syscalls/syslog/syslog04
> +++ b/testcases/kernel/syscalls/syslog/syslog04
> @@ -62,6 +62,7 @@ exit $status_flag
> }
> syslog_case4()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -84,7 +85,7 @@ syslog_case4()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -128,7 +129,8 @@ syslog_case4()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "user.info /var/log/messages" > $CONFIG_FILE;;
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "user.info /var/log/messages" >> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> echo "source src{ internal(); unix-dgram(\"/dev/log\");
> \
> diff --git a/testcases/kernel/syscalls/syslog/syslog05
> b/testcases/kernel/syscalls/syslog/syslog05
> index 6df53c3..604b1cd 100755
> --- a/testcases/kernel/syscalls/syslog/syslog05
> +++ b/testcases/kernel/syscalls/syslog/syslog05
> @@ -68,6 +68,7 @@ exit $status_flag
>
> syslog_case5()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -92,7 +93,7 @@ syslog_case5()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -126,7 +127,8 @@ syslog_case5()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "user.info /var/log/messages" > $CONFIG_FILE;;
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "user.info /var/log/messages" >> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> echo "source src{ internal(); unix-dgram(\"/dev/log\"); \
> diff --git a/testcases/kernel/syscalls/syslog/syslog06
> b/testcases/kernel/syscalls/syslog/syslog06
> index 5b268d7..4222d7a 100755
> --- a/testcases/kernel/syscalls/syslog/syslog06
> +++ b/testcases/kernel/syscalls/syslog/syslog06
> @@ -68,6 +68,7 @@ exit $status_flag
>
> syslog_case6()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -95,7 +96,7 @@ syslog_case6()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -139,7 +140,8 @@ syslog_case6()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "user.info /var/log/messages" > $CONFIG_FILE;;
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "user.info /var/log/messages" >> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> echo "source src{ internal(); unix-dgram(\"/dev/log\"); \
> diff --git a/testcases/kernel/syscalls/syslog/syslog07
> b/testcases/kernel/syscalls/syslog/syslog07
> index 6b99445..620c1b6 100755
> --- a/testcases/kernel/syscalls/syslog/syslog07
> +++ b/testcases/kernel/syscalls/syslog/syslog07
> @@ -69,6 +69,7 @@ exit $status_flag
>
> syslog_case7()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -101,7 +102,7 @@ syslog_case7()
> tst_resm TINFO " configuration file."
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -156,7 +157,8 @@ fi
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "user.debug /var/log/messages" > $CONFIG_FILE;;
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "user.debug /var/log/messages" >> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> echo "source src{ internal(); unix-dgram(\"/dev/log\");
> \
> diff --git a/testcases/kernel/syscalls/syslog/syslog08
> b/testcases/kernel/syscalls/syslog/syslog08
> index 50d6455..84f8491 100755
> --- a/testcases/kernel/syscalls/syslog/syslog08
> +++ b/testcases/kernel/syscalls/syslog/syslog08
> @@ -67,6 +67,7 @@ exit $status_flag
>
> syslog_case8()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -94,7 +95,7 @@ syslog_case8()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -142,7 +143,8 @@ syslog_case8()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "$current.info /var/log/messages" > $CONFIG_FILE
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "$current.info /var/log/messages" >>
> $CONFIG_FILE
> echo "$current.info /var/log/maillog" >>
> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> diff --git a/testcases/kernel/syscalls/syslog/syslog09
> b/testcases/kernel/syscalls/syslog/syslog09
> index 816b00c..ab360fa 100755
> --- a/testcases/kernel/syscalls/syslog/syslog09
> +++ b/testcases/kernel/syscalls/syslog/syslog09
> @@ -66,6 +66,7 @@ exit $status_flag
>
> syslog_case9()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -88,8 +89,8 @@ syslog_case9()
> 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"
> syslog_cmd="/etc/init.d/rsyslog"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -132,7 +133,8 @@ syslog_case9()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "user.debug /var/log/messages" > $CONFIG_FILE;;
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "user.debug /var/log/messages" >> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> echo "source src{ internal(); unix-dgram(\"/dev/log\"); \
> diff --git a/testcases/kernel/syscalls/syslog/syslog10
> b/testcases/kernel/syscalls/syslog/syslog10
> index 3890600..d194185 100755
> --- a/testcases/kernel/syscalls/syslog/syslog10
> +++ b/testcases/kernel/syscalls/syslog/syslog10
> @@ -69,6 +69,7 @@ exit $status_flag
>
> syslog_case10()
> {
> + RSYSLOG_CONFIG=""
> #set the trap to handle signals.
> trap '
> tst_resm TBROK "Testing is terminating due to a signal"
> @@ -92,7 +93,7 @@ syslog_case10()
> then
> CONFIG_FILE="/etc/rsyslog.conf"
> syslog_cmd="/etc/init.d/rsyslog"
> - tst_resm TINFO "using rsyslogd; you have to set it to compatibility
> mode"
> + RSYSLOG_CONFIG='$ModLoad imuxsock.so'
> else
> tst_resm TBROK "syslogd or syslog-ng no such command"
> status_flag=1
> @@ -136,7 +137,8 @@ syslog_case10()
> case "$CONFIG_FILE" in
> "/etc/syslog.conf" |\
> "/etc/rsyslog.conf")
> - echo "user.debug /var/log/messages" > $CONFIG_FILE;;
> + echo "$RSYSLOG_CONFIG" > $CONFIG_FILE
> + echo "user.debug /var/log/messages" >> $CONFIG_FILE;;
>
> "/etc/syslog-ng/syslog-ng.conf")
> echo "source src{ internal(); unix-dgram(\"/dev/log\");\
> --
> 1.6.0.6
>
>
>
> ------------------------------------------------------------------------------
> 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
------------------------------------------------------------------------------
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
