From 98f8edbde599c250f8dffea2b0df4d6d53dd492a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 12 Mar 2012 13:57:37 -0700 Subject: [PATCH] Apply two patches from Tuomo Soini Signed-off-by: Tom Eastep --- Shorewall/install.sh | 4 ++++ Shorewall6/configfiles/isusable | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index dd0a8bb46..7fc03f7fc 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -917,6 +917,10 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/$PRODUCT/clear ]; then echo "Clear file installed as ${DESTDIR}/etc/$PRODUCT/clear" fi # +# Install the Isusable file +# +run_install $OWNERSHIP -m 0644 isusable ${DESTDIR}/usr/share/$PRODUCT/configfiles/isusable +# # Install the Refresh file # run_install $OWNERSHIP -m 0644 refresh ${DESTDIR}/usr/share/$PRODUCT/configfiles/refresh diff --git a/Shorewall6/configfiles/isusable b/Shorewall6/configfiles/isusable index 4225743c8..7a4dd97fc 100644 --- a/Shorewall6/configfiles/isusable +++ b/Shorewall6/configfiles/isusable @@ -8,13 +8,15 @@ # # The script is invoked inside a function that accepts an interface # name as a single argument. The file below is designed to work with -# both swping and lsm as described at http://www.shorewall.net/MultiISP.html +# both swping and lsm as described at +# http://www.shorewall.net/MultiISP.html # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. # ############################################################################### -local status=0 +local status +status=0 [ -f ${VARDIR}/${1}.status ] && status=$(cat ${VARDIR}/${1}.status)