From 59f76c7d49b894500f37beb7878846648fb5c5b1 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 23 Sep 2004 22:07:54 +0000
Subject: [PATCH] Add 'brctl show' output to the status command

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1638 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 STABLE2/changelog.txt    | 2 ++
 STABLE2/releasenotes.txt | 8 +++++++-
 STABLE2/shorewall        | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 245911641..3d955b30b 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -56,3 +56,5 @@ Changes in 2.0.9
 1) Corrected setup_tc1() handling of the PROTO column.
 
 2) Added warning about ADD_SNAT_ALIASES in the masq file.
+
+3) Added "brctl show" to the status command. 
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index 3dd1a7b8a..4d7d6b354 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 2.0.8
+Shorewall 2.0.9
 
 ----------------------------------------------------------------------
 Problems Corrected in version 2.0.4
@@ -125,6 +125,12 @@ Problems Corrected in version 2.0.9
 1) Previously, an empty PROTO column or a value of "all" in that column
    would cause errors when processing the /etc/shorewall/tcrules file.
 
+New Fewatures in version 2.0.9
+
+1) The "shorewall status" command now includes the output of "brctl
+   show" if the bridge tools are installed.
+
+
 
 
 
diff --git a/STABLE2/shorewall b/STABLE2/shorewall
index 35eb4904c..b0470a0e5 100755
--- a/STABLE2/shorewall
+++ b/STABLE2/shorewall
@@ -885,6 +885,14 @@ case "$1" in
 	echo "IP Configuration"
 	echo
 	ip addr ls
+	
+	if qt which brctl; then
+	    echo
+	    echo "Bridges"
+	    echo
+	    brctl show
+	fi
+
 	echo
 	echo "Routing Rules"
 	echo