adding verbose config option

2 files changed, 18 insertions, 2 deletions

diff --git a/src/bbfw.conf-example.in b/src/bbfw.conf-example.in
index 867cb91..e8a62fa 100644
--- a/src/bbfw.conf-example.in
+++ b/src/bbfw.conf-example.in
@@ -39,4 +39,10 @@
 # quiet = no
 
 
+#   The `verbose` option enables verbose output for utilities which support
+#   verbose flags (currently only iptables).  To enable verbose output,
+#   uncomment the line below and change the value to 'yes'.
+# verbose = yes
+
+
 # end of configuration
diff --git a/src/bbfw.in b/src/bbfw.in
index f2a5f61..ae5ce9a 100755
--- a/src/bbfw.in
+++ b/src/bbfw.in
@@ -81,6 +81,7 @@ export PATH
 FW_PREFIX=@sysconfdir@/firewall.d/
 FW_CONF=@sysconfdir@/bbfw.conf
 FW_QUIET=no
+FW_VERBOSE=no
 
 
 ###########
@@ -206,8 +207,8 @@ load()
 
    case "${TYPE}" in
       'ipset')     clean_file ${FILE} |ipset -! restore;;
-      'iptables')  clean_file ${FILE} |iptables-restore -n;;
-      'ip6tables') clean_file ${FILE} |ip6tables-restore -n;;
+      'iptables')  clean_file ${FILE} |iptables-restore -n ${FW_VERBOSE};;
+      'ip6tables') clean_file ${FILE} |ip6tables-restore -n ${FW_VERBOSE};;
       *) ;;
    esac
 }
@@ -351,6 +352,7 @@ stop() {
 # sets options from configuration file
 FW_PREFIX="$(  config_option firewall_dir "${FW_PREFIX}" )"
 FW_QUIET="$(   config_option quiet        "${FW_QUIET}"   A-Z a-z )"
+FW_VERBOSE="$( config_option verbose      "${FW_VERBOSE}" A-Z a-z )"
 
 
 # checks and normalizes options
@@ -360,6 +362,14 @@ elsif test "x${FW_QUIET}" != "xno";then
    echo "${PROGRAM_NAME}: invalid value for option 'quiet'" 1>&2
    exit 1
 fi
+if test "x${FW_VERBOSE}" == "xno";then
+   unset FW_VERBOSE
+elsif test "x${FW_VERBOSE}" != "xno";then
+   echo "${PROGRAM_NAME}: invalid value for verbose 'quiet'" 1>&2
+   exit 1
+else
+   FW_VERBOSE=-v
+fi
 
 
 case "$1" in