From 5f9b3901a058c8a530d3831027a21c5497a07807 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Tue, 8 May 2018 17:43:30 +0200 Subject: tests/check_klog.sh: Try dmesg too, don't let shell terminate script Some hosts might not use /var/log/kern.log for kernel messages, so if we can't find a match there, try dmesg next. If no matches are found, don't let the shell terminate the script, so that we have a chance to try dmesg and actually echo "no match!" if no matches are found: set +e before the setname loop. Signed-off-by: Stefano Brivio Signed-off-by: Jozsef Kadlecsik --- tests/check_klog.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/check_klog.sh') diff --git a/tests/check_klog.sh b/tests/check_klog.sh index 146e492..9af5f66 100755 --- a/tests/check_klog.sh +++ b/tests/check_klog.sh @@ -42,8 +42,12 @@ ipaddr=`expand_ipv6 $1`; shift proto=`echo $1 | tr a-z A-Z`; shift port=$1; shift +set +e for setname in $@; do match=`tail -n +$loglines /var/log/kern.log | grep -e "in set $setname: .* SRC=$ipaddr .* PROTO=$proto SPT=$port .*"` + if [ -z "$match" ]; then + match=`dmesg | tail -n +$loglines | grep -e "in set $setname: .* SRC=$ipaddr .* PROTO=$proto SPT=$port .*"` + fi if [ -z "$match" ]; then echo "no match!" exit 1 -- cgit v1.2.3