--- trunk/iptables/iptables.rc 2011/07/18 17:40:00 1426 +++ trunk/iptables/iptables.rc 2011/07/18 18:33:25 1427 @@ -27,8 +27,8 @@ { if [[ ! -f ${IPTABLES_SAVE_PATH} ]] then - echo -e ${COLRED} "Not starting ${SVC_NAME}. First create some rules then run:" - echo -e ${COLRED} "/etc/init.d/${SVC_NAME} save" + rc_echo -e ${COLRED} "Not starting ${SVC_NAME}. First create some rules then run:" + rc_echo -e ${COLRED} "/etc/init.d/${SVC_NAME} save" exit 1 fi return 0 @@ -60,7 +60,7 @@ case "$1" in start) checkconfig - echo -e ${COLOREDSTAR}"Loading ${SVC_NAME} ruleset ..." + rc_print "Loading ${SVC_NAME} ruleset ..." ${IPTABLES_RESTORE} ${SAVE_RESTORE_OPTIONS} < "${IPTABLES_SAVE_PATH}" evaluate_retval @@ -75,7 +75,7 @@ $0 save fi - echo -e ${COLOREDSTAR}"Stopping ${SVC_NAME} and reseting ruleset ..." + rc_print "Stopping ${SVC_NAME} and reseting ruleset ..." for rule in $(<${IPTABLES_PROC}) do @@ -95,7 +95,7 @@ ;; reload) - echo -e ${COLOREDSTAR}"Flushing ${SVC_NAME} ruleset ..." + rc_print "Flushing ${SVC_NAME} ruleset ..." for rule in $(<${IPTABLES_PROC}) do # flush rules @@ -108,7 +108,7 @@ ;; save) - echo -e ${COLOREDSTAR}"Saving ${SVC_NAME} ruleset ..." + rc_print "Saving ${SVC_NAME} ruleset ..." [ ! -d $(dirname ${IPTABLES_SAVE_PATH}) ] && install -d $(dirname ${IPTABLES_SAVE_PATH}) touch "${IPTABLES_SAVE_PATH}" @@ -117,7 +117,7 @@ ;; panic) - echo -e ${COLOREDSTAR}"Enabled Panic-Mode for ${SVC_NAME} (DROP ALL) ..." + rc_print "Enabled Panic-Mode for ${SVC_NAME} (DROP ALL) ..." for rule in $(<${IPTABLES_PROC}) do ${IPTABLES} -F -t ${rule} @@ -135,7 +135,7 @@ ;; *) - echo "Usage: $0 {start|stop|reload|save|panic|restart}" + rc_echo "Usage: $0 {start|stop|reload|save|panic|restart}" exit 1 ;; esac