From 333ac21c2fd66b41cc6617aefe524c43c2a04869 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 28 Feb 2010 15:25:25 -0800
Subject: [PATCH] Prepare the footers for 4.6.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/prog.footer  | 24 ++++++++++++++
 Shorewall/Perl/prog.footer6 | 66 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Perl/prog.footer b/Shorewall/Perl/prog.footer
index 2c1897ad8..8bd2dd11d 100644
--- a/Shorewall/Perl/prog.footer
+++ b/Shorewall/Perl/prog.footer
@@ -62,6 +62,30 @@ while [ $finished -eq 0 -a $# -gt 0 ]; do
 			NOROUTES=Yes
 			option=${option#n}
 			;;
+		    t*)
+			TIMESTAMP=Yes
+			option=${option#t}
+			;;			
+		    r*)
+			RECOVERING=Yes
+			option=${option#r}
+			;;
+		    V*)
+			option=${option#V}
+			if [ -n "$option" ]; then
+			    case $option in
+				-1|0|1|2)
+				    VERBOSE=$option
+				    option=
+				    ;;
+				*)
+				    startup_error "Invalid -V option ($option)"
+				    ;;
+			    esac
+			else
+			    startup_error "Missing -V option"
+			fi
+			;;
 		    *)
 			usage 1
 			;;
diff --git a/Shorewall/Perl/prog.footer6 b/Shorewall/Perl/prog.footer6
index f7b458983..d2e79b25c 100644
--- a/Shorewall/Perl/prog.footer6
+++ b/Shorewall/Perl/prog.footer6
@@ -62,7 +62,71 @@ while [ $finished -eq 0 -a $# -gt 0 ]; do
 			NOROUTES=Yes
 			option=${option#n}
 			;;
-		    *)
+		    t*)
+			TIMESTAMP=Yes
+			option=${option#t}
+			;;			
+		    r*)
+			RECOVERING=Yes
+			option=${option#r}
+			;;
+		    V*)
+			option=${option#V}
+			if [ -n "$option" ]; then
+			    case $option in
+				-1|0|1|2)
+				    VERBOSE=$option
+				    option=
+				    ;;
+				*)
+				    startup_error "Invalid -V option ($option)"
+				    ;;
+			    esac
+			else
+			    startup_error "Missing -V option"
+			fi
+			;;
+		esac
+	    done
+	    shift
+	    ;;
+	*)
+	    finished=1
+            ;;
+    esac
+done
+
+COMMAND="$1"
+
+[ -n "${PRODUCT:=Shorewall6}" ]
+
+kernel=$(printf "%2d%02d%02d" $(uname -r 2> /dev/null | sed -e 's/-.*//' -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/\1 \2 \3/g'))
+if [ $kernel -lt 20624 ]; then
+    error_message "ERROR: $PRODUCT requires Linux kernel 2.6.24 or later"
+    status=2
+else
+    case "$COMMAND" in
+	start)
+	    [ $# -ne 1 ] && usage 2
+	    if shorewall6_is_started; then
+		error_message "$PRODUCT is already Running"
+		status=0
+	    else
+		progress_message3 "Starting $PRODUCT...."
+		detect_configuration
+		define_firewall
+		status=$?
+		[ -n "$SUBSYSLOCK" -a $status -eq 0 ] && touch $SUBSYSLOCK
+		progress_message3 "done."
+	    fi
+	    ;;
+	stop)
+	    [ $# -ne 1 ] && usage 2
+	    progress_message3 "Stopping $PRODUCT...."
+	    detect_configuration
+	    stop_firewall
+	    status=0
+	    [ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK		    *)
 			usage 1
 			;;
 		esac