Cleanup of 1.3.9 for Bering

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@261 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/firewall

@@ -81,7 +81,7 @@ list_count() {
 
 ###############################################################################
 # Mutual exclusion -- These functions are jackets for the mutual exclusion    #
-#		      routines in /var/lib/shorewall/functions. They invoke   #
+#		      routines in /usr/lib/shorewall/functions. They invoke   #
 #		      the corresponding function in that file if the user did #
 #		      not specify "nolock" on the runline.		      #
 ###############################################################################
@@ -3353,7 +3353,7 @@ define_firewall() # $1 = Command (Start or Restart)
 
     createchain shorewall no
 
-    date > /var/lib/shorewall/restarted
+    date > $STATEDIR/restarted
 
     report "Shorewall ${1}ed"
 
@@ -3560,6 +3560,7 @@ do_initialize() {
 
     [ -d $STATEDIR ] || mkdir -p $STATEDIR
 
+
     [ -z "$FW" ] && FW=fw
 
     ALLOWRELATED="`added_param_value_yes ALLOWRELATED $ALLOWRELATED`"
@@ -3676,7 +3677,7 @@ case "$command" in
     reset)
 	iptables -L -n -Z -v
 	report "Shorewall Counters Reset"
-	date > /var/lib/shorewall/restarted
+	date > $STATEDIR/restarted
 	;;
 
     refresh)

Shorewall/functions

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Shorewall 1.3 -- /var/lib/shorewall/functions
+# Shorewall 1.3 -- /usr/lib/shorewall/functions
 
 #
 # Suppress all output for a command

Shorewall/releasenotes.txt

@@ -13,5 +13,4 @@ New features include:
 
 4. The 'functions' and 'version' files and the 'firewall' symbolic link
    have been moved from /var/lib/shorewall to /usr/lib/shorewall to
-   appease the LFS police at Debian. Bering users may now insert
-   "var/lib/shorewall" back into /var/lib/lrpkg/root.exclude.list.
+   appease the LFS police at Debian.

Shorewall/shorewall

@@ -441,8 +441,8 @@ usage() # $1 = exit status
 # Display the time that the counters were last reset                            #
 #################################################################################
 show_reset() {
-    [ -f /var/lib/shorewall/restarted ] && \
-	echo -e "Counters reset `cat /var/lib/shorewall/restarted`\\n"
+    [ -f $STATEDIR/restarted ] && \
+	echo -e "Counters reset `cat $STATEDIR/restarted`\\n"
 }
 
 #################################################################################
@@ -550,6 +550,7 @@ case "$1" in
 	    iptables -t nat -L -n -v
 	    ;;
 	tos|mangle)
+	    get_config
 	    echo -e "Shorewall-$version TOS at $HOSTNAME - `date`\\n"
 	    show_reset
 	    iptables -t mangle -L -n -v
@@ -566,6 +567,7 @@ case "$1" in
 	    show_tc
 	    ;;
 	*)
+	    get_config
 	    echo -e "Shorewall-$version Chain $2 at $HOSTNAME - `date`\\n"
 	    show_reset
 	    iptables -L $2 -n -v