From 2d19cd1ebba127416ffd9aa68aa12e46adcba73f Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 24 May 2010 06:37:02 -0700
Subject: [PATCH] Add options to readlink

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-init/uninstall.sh  | 4 ++--
 Shorewall-lite/uninstall.sh  | 2 +-
 Shorewall/uninstall.sh       | 2 +-
 Shorewall6-lite/uninstall.sh | 2 +-
 Shorewall6/uninstall.sh      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index bb9ee2836..8e189a134 100755
--- a/Shorewall-init/uninstall.sh
+++ b/Shorewall-init/uninstall.sh
@@ -76,8 +76,8 @@ if [ -n "$INITSCRIPT" ]; then
     remove_file $INITSCRIPT
 fi
 
-[ "$(readlink /sbin/ifup-local)"   = /usr/share/shorewall-init ] && remove_file /sbin/ifup-local
-[ "$(readlink /sbin/ifdown-local)" = /usr/share/shorewall-init ] && remove_file /sbin/ifdown-local
+[ "$(readlink -m -q /sbin/ifup-local)"   = /usr/share/shorewall-init ] && remove_file /sbin/ifup-local
+[ "$(readlink -m -q /sbin/ifdown-local)" = /usr/share/shorewall-init ] && remove_file /sbin/ifdown-local
 
 remove_file /etc/default/shorewall-init
 remove_file /etc/sysconfig/shorewall-init
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index f25fef7bb..94cb1d2f3 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -79,7 +79,7 @@ if qt iptables -L shorewall -n && [ ! -f /sbin/shorewall ]; then
 fi
 
 if [ -L /usr/share/shorewall-lite/init ]; then
-    FIREWALL=$(readlink /usr/share/shorewall-lite/init)
+    FIREWALL=$(readlink -m -q /usr/share/shorewall-lite/init)
 else
     FIREWALL=/etc/init.d/shorewall-lite
 fi
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index 4dc6f88e1..d63f1d9d8 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -79,7 +79,7 @@ if qt iptables -L shorewall -n && [ ! -f /sbin/shorewall-lite ]; then
 fi
 
 if [ -L /usr/share/shorewall/init ]; then
-    FIREWALL=$(readlink /usr/share/shorewall/init)
+    FIREWALL=$(readlink -m -q /usr/share/shorewall/init)
 else
     FIREWALL=/etc/init.d/shorewall
 fi
diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh
index 36e8fc761..2010e8fb4 100755
--- a/Shorewall6-lite/uninstall.sh
+++ b/Shorewall6-lite/uninstall.sh
@@ -67,7 +67,7 @@ if qt ip6tables -L shorewall -n && [ ! -f /sbin/shorewall6 ]; then
 fi
 
 if [ -L /usr/share/shorewall6-lite/init ]; then
-    FIREWALL=$(readlink /usr/share/shorewall6-lite/init)
+    FIREWALL=$(readlink -m -q /usr/share/shorewall6-lite/init)
 else
     FIREWALL=/etc/init.d/shorewall6-lite
 fi
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index 231a9b867..3bbb70265 100755
--- a/Shorewall6/uninstall.sh
+++ b/Shorewall6/uninstall.sh
@@ -79,7 +79,7 @@ if qt ip6tables -L shorewall6 -n && [ ! -f /sbin/shorewall6-lite ]; then
 fi
 
 if [ -L /usr/share/shorewall6/init ]; then
-    FIREWALL=$(readlink /usr/share/shorewall6/init)
+    FIREWALL=$(readlink -m -q /usr/share/shorewall6/init)
 else
     FIREWALL=/etc/init.d/shorewall6
 fi