diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 89e7fb06c..241bbd065 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -223,10 +223,6 @@ else first_install="Yes" fi -install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout - -echo "shorewall control program installed in ${PREFIX}/sbin/shorewall" - # # Install the Firewall Script # @@ -276,6 +272,16 @@ if [ ! -f ${PREFIX}/etc/shorewall/zones ]; then run_install $OWNERSHIP -m 0744 zones ${PREFIX}/etc/shorewall/zones echo "Zones file installed as ${PREFIX}/etc/shorewall/zones" fi +# +# Install control program +# +if [ -n "$PREFIX" ]; then + install_file shorewall ${PREFIX}/usr/share/shorewall/shorewall 0555 + echo "shorewall control program installed in ${PREFIX}/usr/share/shorewall/shorewall" +else + install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout + echo "shorewall control program installed in ${PREFIX}/sbin/shorewall" +fi # # Install the functions file