- Correct typo in command
- Correct spacing
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/uninstall.sh | 6 +++---
Shorewall-lite/uninstall.sh | 6 +++---
Shorewall/uninstall.sh | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index 00dacf9..ce12bf6 100755
--- a/Shorewall-init/uninstall.sh
+++ b/Shorewall-init/uninstall.sh
@@ -143,14 +143,14 @@ FIREWALL=${CONFDIR}/init.d/$PRODUCT
if [ -f "$FIREWALL" ]; then
if [ $configure -eq 1 ]; then
- if [ $HOST = openwrt ]; then
+ if [ $HOST = openwrt ] ; then
if /etc/init.d/$PRODUCT enabled; then
/etc/init.d/$PRODUCT disable
fi
- elif mywhich updaterc.d ; then
- updaterc.d ${PRODUCT} remove
elif mywhich insserv ; then
insserv -r $FIREWALL
+ elif mywhich update-rc.d ; then
+ update-rc.d ${PRODUCT} remove
elif mywhich chkconfig ; then
chkconfig --del $(basename $FIREWALL)
fi
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index 71e5a3d..2c45369 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -167,10 +167,10 @@ fi
if [ -f "$FIREWALL" ]; then
if [ $configure -eq 1 ]; then
- if mywhich updaterc.d ; then
- updaterc.d ${PRODUCT} remove
- elif mywhich insserv ; then
+ if mywhich insserv ; then
insserv -r $FIREWALL
+ elif mywhich update-rc.d ; then
+ update-rc.d ${PRODUCT} remove
elif mywhich chkconfig ; then
chkconfig --del $(basename $FIREWALL)
fi
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index 6a9f020..1b81cd3 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -159,10 +159,10 @@ fi
if [ -f "$FIREWALL" ]; then
if [ $configure -eq 1 ]; then
- if mywhich updaterc.d ; then
- updaterc.d ${PRODUCT} remove
- elif mywhich insserv ; then
+ if mywhich insserv ; then
insserv -r $FIREWALL
+ elif mywhich update-rc.d ; then
+ update-rc.d ${PRODUCT} remove
elif mywhich chkconfig ; then
chkconfig --del $(basename $FIREWALL)
fi
--
2.8.3
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
