From c56836728ab0186aa8e9d8b3855601d130e0b6e2 Mon Sep 17 00:00:00 2001 From: Mike Makonnen Date: Wed, 30 Apr 2003 02:54:17 +0000 Subject: [PATCH] o Make the 'Ip-filter module loaded' messages informational o Make 'No ipnat rules' a warning o Remove unecessary ' ..' Approved by: markm (implicit) --- etc/rc.d/ipfilter | 2 +- etc/rc.d/ipnat | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter index 23be7147d0d..cf2e8ceaef2 100755 --- a/etc/rc.d/ipfilter +++ b/etc/rc.d/ipfilter @@ -42,7 +42,7 @@ FreeBSD) # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi diff --git a/etc/rc.d/ipnat b/etc/rc.d/ipnat index 79131314384..9285348d6f1 100755 --- a/etc/rc.d/ipnat +++ b/etc/rc.d/ipnat @@ -44,7 +44,7 @@ ipnat_precmd() # Make sure ipfilter is loaded before continuing if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -55,10 +55,10 @@ ipnat_precmd() ipnat_start() { if [ ! -f ${ipnat_rules} ]; then - echo -n ' NO IPNAT RULES' + warn 'NO IPNAT RULES' return 0 fi - echo -n "Installing NAT rules ... " + echo -n "Installing NAT rules." ${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags} }