From 3c4b41fbe0c671bf81ae4363e8d7d56d3fe79945 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 27 Feb 2010 11:48:39 -0800 Subject: [PATCH] Implement -s option in the major installers Signed-off-by: Tom Eastep --- Shorewall/changelog.txt | 2 + Shorewall/install.sh | 89 ++++++++++++++++++++------------------ Shorewall/releasenotes.txt | 4 ++ Shorewall6/install.sh | 71 ++++++++++++++++-------------- 4 files changed, 91 insertions(+), 75 deletions(-) diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 7c3901087..ac7702733 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -12,6 +12,8 @@ Changes in Shorewall 4.4.8 6) Fix NFQUEUE(queue-num) in policy +7) Implement -s option in install.sh + Changes in Shorewall 4.4.7 1) Backport optimization changes from 4.5. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 9bcf49df9..a22c67b3f 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -109,6 +109,7 @@ fi DEBIAN= CYGWIN= +SPARSE= MANDIR=${MANDIR:-"/usr/share/man"} case $(uname) in @@ -121,6 +122,7 @@ case $(uname) in OWNER=$(id -un) GROUP=$(id -gn) CYGWIN=Yes + SPARSE=Yes ;; *) [ -z "$OWNER" ] && OWNER=root @@ -139,6 +141,9 @@ while [ $# -gt 0 ] ; do echo "Shorewall Firewall Installer Version $VERSION" exit 0 ;; + -s) + SPARSE=Yes + ;; *) usage 1 ;; @@ -276,7 +281,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/zones ${PREFIX}/usr/share/shorewall/configfiles/zones -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/zones ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/zones ]; then run_install $OWNERSHIP -m 0744 configfiles/zones ${PREFIX}/etc/shorewall/zones echo "Zones file installed as ${PREFIX}/etc/shorewall/zones" fi @@ -309,7 +314,7 @@ echo "wait4ifup installed in ${PREFIX}/usr/share/shorewall/wait4ifup" # run_install $OWNERSHIP -m 0644 configfiles/policy ${PREFIX}/usr/share/shorewall/configfiles/policy -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/policy ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/policy ]; then run_install $OWNERSHIP -m 0600 configfiles/policy ${PREFIX}/etc/shorewall/policy echo "Policy file installed as ${PREFIX}/etc/shorewall/policy" fi @@ -318,7 +323,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/interfaces ${PREFIX}/usr/share/shorewall/configfiles/interfaces -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/interfaces ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/interfaces ]; then run_install $OWNERSHIP -m 0600 configfiles/interfaces ${PREFIX}/etc/shorewall/interfaces echo "Interfaces file installed as ${PREFIX}/etc/shorewall/interfaces" fi @@ -328,7 +333,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/hosts ${PREFIX}/usr/share/shorewall/configfiles/hosts -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/hosts ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/hosts ]; then run_install $OWNERSHIP -m 0600 configfiles/hosts ${PREFIX}/etc/shorewall/hosts echo "Hosts file installed as ${PREFIX}/etc/shorewall/hosts" fi @@ -337,7 +342,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/rules ${PREFIX}/usr/share/shorewall/configfiles/rules -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/rules ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/rules ]; then run_install $OWNERSHIP -m 0600 configfiles/rules ${PREFIX}/etc/shorewall/rules echo "Rules file installed as ${PREFIX}/etc/shorewall/rules" fi @@ -346,7 +351,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/nat ${PREFIX}/usr/share/shorewall/configfiles/nat -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/nat ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/nat ]; then run_install $OWNERSHIP -m 0600 configfiles/nat ${PREFIX}/etc/shorewall/nat echo "NAT file installed as ${PREFIX}/etc/shorewall/nat" fi @@ -355,7 +360,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/netmap ${PREFIX}/usr/share/shorewall/configfiles/netmap -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/netmap ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/netmap ]; then run_install $OWNERSHIP -m 0600 configfiles/netmap ${PREFIX}/etc/shorewall/netmap echo "NETMAP file installed as ${PREFIX}/etc/shorewall/netmap" fi @@ -375,7 +380,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/proxyarp ${PREFIX}/usr/share/shorewall/configfiles/proxyarp -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/proxyarp ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/proxyarp ]; then run_install $OWNERSHIP -m 0600 configfiles/proxyarp ${PREFIX}/etc/shorewall/proxyarp echo "Proxy ARP file installed as ${PREFIX}/etc/shorewall/proxyarp" fi @@ -384,7 +389,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/routestopped ${PREFIX}/usr/share/shorewall/configfiles/routestopped -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/routestopped ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/routestopped ]; then run_install $OWNERSHIP -m 0600 configfiles/routestopped ${PREFIX}/etc/shorewall/routestopped echo "Stopped Routing file installed as ${PREFIX}/etc/shorewall/routestopped" fi @@ -393,7 +398,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/maclist ${PREFIX}/usr/share/shorewall/configfiles/maclist -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/maclist ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/maclist ]; then run_install $OWNERSHIP -m 0600 configfiles/maclist ${PREFIX}/etc/shorewall/maclist echo "MAC list file installed as ${PREFIX}/etc/shorewall/maclist" fi @@ -402,7 +407,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/masq ${PREFIX}/usr/share/shorewall/configfiles/masq -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/masq ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/masq ]; then run_install $OWNERSHIP -m 0600 configfiles/masq ${PREFIX}/etc/shorewall/masq echo "Masquerade file installed as ${PREFIX}/etc/shorewall/masq" fi @@ -411,7 +416,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/notrack ${PREFIX}/usr/share/shorewall/configfiles/notrack -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/notrack ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/notrack ]; then run_install $OWNERSHIP -m 0600 configfiles/notrack ${PREFIX}/etc/shorewall/notrack echo "Notrack file installed as ${PREFIX}/etc/shorewall/notrack" fi @@ -432,7 +437,7 @@ echo "Helper modules file installed as ${PREFIX}/usr/share/shorewall/helpers" # run_install $OWNERSHIP -m 0644 configfiles/tcrules ${PREFIX}/usr/share/shorewall/configfiles/tcrules -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcrules ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tcrules ]; then run_install $OWNERSHIP -m 0600 configfiles/tcrules ${PREFIX}/etc/shorewall/tcrules echo "TC Rules file installed as ${PREFIX}/etc/shorewall/tcrules" fi @@ -442,7 +447,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tcinterfaces ${PREFIX}/usr/share/shorewall/configfiles/tcinterfaces -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcinterfaces ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tcinterfaces ]; then run_install $OWNERSHIP -m 0600 configfiles/tcinterfaces ${PREFIX}/etc/shorewall/tcinterfaces echo "TC Interfaces file installed as ${PREFIX}/etc/shorewall/tcinterfaces" fi @@ -452,7 +457,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tcpri ${PREFIX}/usr/share/shorewall/configfiles/tcpri -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcpri ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tcpri ]; then run_install $OWNERSHIP -m 0600 configfiles/tcpri ${PREFIX}/etc/shorewall/tcpri echo "TC Priority file installed as ${PREFIX}/etc/shorewall/tcpri" fi @@ -462,7 +467,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tos ${PREFIX}/usr/share/shorewall/configfiles/tos -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tos ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tos ]; then run_install $OWNERSHIP -m 0600 configfiles/tos ${PREFIX}/etc/shorewall/tos echo "TOS file installed as ${PREFIX}/etc/shorewall/tos" fi @@ -471,7 +476,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tunnels ${PREFIX}/usr/share/shorewall/configfiles/tunnels -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tunnels ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tunnels ]; then run_install $OWNERSHIP -m 0600 configfiles/tunnels ${PREFIX}/etc/shorewall/tunnels echo "Tunnels file installed as ${PREFIX}/etc/shorewall/tunnels" fi @@ -480,7 +485,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/blacklist ${PREFIX}/usr/share/shorewall/configfiles/blacklist -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/blacklist ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/blacklist ]; then run_install $OWNERSHIP -m 0600 configfiles/blacklist ${PREFIX}/etc/shorewall/blacklist echo "Blacklist file installed as ${PREFIX}/etc/shorewall/blacklist" fi @@ -489,7 +494,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/findgw ${PREFIX}/usr/share/shorewall/configfiles/findgw -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/findgw ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/findgw ]; then run_install $OWNERSHIP -m 0600 configfiles/findgw ${PREFIX}/etc/shorewall/findgw echo "Find GW file installed as ${PREFIX}/etc/shorewall/findgw" fi @@ -517,7 +522,7 @@ delete_file ${PREFIX}/usr/share/shorewall/xmodules # run_install $OWNERSHIP -m 0644 configfiles/providers ${PREFIX}/usr/share/shorewall/configfiles/providers -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/providers ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/providers ]; then run_install $OWNERSHIP -m 0600 configfiles/providers ${PREFIX}/etc/shorewall/providers echo "Providers file installed as ${PREFIX}/etc/shorewall/providers" fi @@ -527,7 +532,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/route_rules ${PREFIX}/usr/share/shorewall/configfiles/route_rules -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/route_rules ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/route_rules ]; then run_install $OWNERSHIP -m 0600 configfiles/route_rules ${PREFIX}/etc/shorewall/route_rules echo "Routing rules file installed as ${PREFIX}/etc/shorewall/route_rules" fi @@ -537,7 +542,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tcclasses ${PREFIX}/usr/share/shorewall/configfiles/tcclasses -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcclasses ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tcclasses ]; then run_install $OWNERSHIP -m 0600 configfiles/tcclasses ${PREFIX}/etc/shorewall/tcclasses echo "TC Classes file installed as ${PREFIX}/etc/shorewall/tcclasses" fi @@ -547,7 +552,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tcdevices ${PREFIX}/usr/share/shorewall/configfiles/tcdevices -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcdevices ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tcdevices ]; then run_install $OWNERSHIP -m 0600 configfiles/tcdevices ${PREFIX}/etc/shorewall/tcdevices echo "TC Devices file installed as ${PREFIX}/etc/shorewall/tcdevices" fi @@ -557,7 +562,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tcfilters ${PREFIX}/usr/share/shorewall/configfiles/tcfilters -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcfilters ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tcfilters ]; then run_install $OWNERSHIP -m 0600 configfiles/tcfilters ${PREFIX}/etc/shorewall/tcfilters echo "TC Filters file installed as ${PREFIX}/etc/shorewall/tcfilters" fi @@ -572,7 +577,7 @@ echo "Default config path file installed as ${PREFIX}/usr/share/shorewall/config # run_install $OWNERSHIP -m 0644 configfiles/init ${PREFIX}/usr/share/shorewall/configfiles/init -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/init ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/init ]; then run_install $OWNERSHIP -m 0600 configfiles/init ${PREFIX}/etc/shorewall/init echo "Init file installed as ${PREFIX}/etc/shorewall/init" fi @@ -581,7 +586,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/initdone ${PREFIX}/usr/share/shorewall/configfiles/initdone -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/initdone ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/initdone ]; then run_install $OWNERSHIP -m 0600 configfiles/initdone ${PREFIX}/etc/shorewall/initdone echo "Initdone file installed as ${PREFIX}/etc/shorewall/initdone" fi @@ -590,7 +595,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/start ${PREFIX}/usr/share/shorewall/configfiles/start -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/start ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/start ]; then run_install $OWNERSHIP -m 0600 configfiles/start ${PREFIX}/etc/shorewall/start echo "Start file installed as ${PREFIX}/etc/shorewall/start" fi @@ -599,7 +604,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/stop ${PREFIX}/usr/share/shorewall/configfiles/stop -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/stop ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/stop ]; then run_install $OWNERSHIP -m 0600 configfiles/stop ${PREFIX}/etc/shorewall/stop echo "Stop file installed as ${PREFIX}/etc/shorewall/stop" fi @@ -608,7 +613,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/stopped ${PREFIX}/usr/share/shorewall/configfiles/stopped -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/stopped ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/stopped ]; then run_install $OWNERSHIP -m 0600 configfiles/stopped ${PREFIX}/etc/shorewall/stopped echo "Stopped file installed as ${PREFIX}/etc/shorewall/stopped" fi @@ -617,7 +622,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/ecn ${PREFIX}/usr/share/shorewall/configfiles/ecn -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/ecn ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/ecn ]; then run_install $OWNERSHIP -m 0600 configfiles/ecn ${PREFIX}/etc/shorewall/ecn echo "ECN file installed as ${PREFIX}/etc/shorewall/ecn" fi @@ -626,7 +631,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/accounting ${PREFIX}/usr/share/shorewall/configfiles/accounting -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/accounting ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/accounting ]; then run_install $OWNERSHIP -m 0600 configfiles/accounting ${PREFIX}/etc/shorewall/accounting echo "Accounting file installed as ${PREFIX}/etc/shorewall/accounting" fi @@ -635,7 +640,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/lib.private ${PREFIX}/usr/share/shorewall/configfiles/lib.private -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/lib.private ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/lib.private ]; then run_install $OWNERSHIP -m 0600 configfiles/lib.private ${PREFIX}/etc/shorewall/lib.private echo "Private library file installed as ${PREFIX}/etc/shorewall/lib.private" fi @@ -644,7 +649,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/started ${PREFIX}/usr/share/shorewall/configfiles/started -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/started ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/started ]; then run_install $OWNERSHIP -m 0600 configfiles/started ${PREFIX}/etc/shorewall/started echo "Started file installed as ${PREFIX}/etc/shorewall/started" fi @@ -653,7 +658,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/restored ${PREFIX}/usr/share/shorewall/configfiles/restored -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/restored ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/restored ]; then run_install $OWNERSHIP -m 0600 configfiles/restored ${PREFIX}/etc/shorewall/restored echo "Restored file installed as ${PREFIX}/etc/shorewall/restored" fi @@ -662,7 +667,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/clear ${PREFIX}/usr/share/shorewall/configfiles/clear -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/clear ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/clear ]; then run_install $OWNERSHIP -m 0600 configfiles/clear ${PREFIX}/etc/shorewall/clear echo "Clear file installed as ${PREFIX}/etc/shorewall/clear" fi @@ -671,7 +676,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/isusable ${PREFIX}/usr/share/shorewall/configfiles/isusable -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/isusable ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/isusable ]; then run_install $OWNERSHIP -m 0600 configfiles/isusable ${PREFIX}/etc/shorewall/isusable echo "Isusable file installed as ${PREFIX}/etc/shorewall/isusable" fi @@ -680,7 +685,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/refresh ${PREFIX}/usr/share/shorewall/configfiles/refresh -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/refresh ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/refresh ]; then run_install $OWNERSHIP -m 0600 configfiles/refresh ${PREFIX}/etc/shorewall/refresh echo "Refresh file installed as ${PREFIX}/etc/shorewall/refresh" fi @@ -689,7 +694,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/refreshed ${PREFIX}/usr/share/shorewall/configfiles/refreshed -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/refreshed ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/refreshed ]; then run_install $OWNERSHIP -m 0600 configfiles/refreshed ${PREFIX}/etc/shorewall/refreshed echo "Refreshed file installed as ${PREFIX}/etc/shorewall/refreshed" fi @@ -698,7 +703,7 @@ fi # run_install $OWNERSHIP -m 0644 configfiles/tcclear ${PREFIX}/usr/share/shorewall/configfiles/tcclear -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcclear ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/tcclear ]; then run_install $OWNERSHIP -m 0600 configfiles/tcclear ${PREFIX}/etc/shorewall/tcclear echo "Tcclear file installed as ${PREFIX}/etc/shorewall/tcclear" fi @@ -713,7 +718,7 @@ echo "Standard actions file installed as ${PREFIX}/usr/shared/shorewall/actions. # run_install $OWNERSHIP -m 0644 configfiles/actions ${PREFIX}/usr/share/shorewall/configfiles/actions -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/actions ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall/actions ]; then run_install $OWNERSHIP -m 0644 configfiles/actions ${PREFIX}/etc/shorewall/actions echo "Actions file installed as ${PREFIX}/etc/shorewall/actions" fi @@ -723,7 +728,7 @@ fi # run_install $OWNERSHIP -m 0644 Makefile-lite ${PREFIX}/usr/share/shorewall/configfiles/Makefile -if [ -z "$CYGWIN" ]; then +if [ -z "$SPARSE" ]; then run_install $OWNERSHIP -m 0600 Makefile ${PREFIX}/etc/shorewall/Makefile echo "Makefile installed as ${PREFIX}/etc/shorewall/Makefile" fi @@ -841,7 +846,7 @@ if [ -z "$PREFIX" -a -n "$first_install" -a -z "$CYGWIN" ]; then echo "shorewall will start automatically at boot" echo "Set startup=1 in /etc/default/shorewall to enable" touch /var/log/shorewall-init.log - qt mywhich perl && perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' /etc/shorewall/shorewall.conf + perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' /etc/shorewall/shorewall.conf else if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then if insserv /etc/init.d/shorewall ; then diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index c84703604..e16fa7358 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -300,6 +300,10 @@ None. See Migration Issue 14 above for additional information. +2) The Shorewall and Shorewall6 installers now accept a '-s' (sparse) + option. That option causes only shorewall.conf to be installed in + /etc/shorewall/. + ---------------------------------------------------------------------------- V I. P R O B L E M S C O R R E C T E D A N D N E W F E A T U R E S I N P R I O R R E L E A S E S diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index baa59b4af..55a0bc201 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -110,6 +110,7 @@ fi DEBIAN= CYGWIN= MANDIR=${MANDIR:-"/usr/share/man"} +SPARSE= case $(uname) in CYGWIN*) @@ -121,6 +122,7 @@ case $(uname) in OWNER=$(id -un) GROUP=$(id -gn) CYGWIN=Yes + SPARSE=Yes ;; *) [ -z "$OWNER" ] && OWNER=root @@ -139,6 +141,9 @@ while [ $# -gt 0 ] ; do echo "Shorewall6 Firewall Installer Version $VERSION" exit 0 ;; + -s) + SPARSE=Yes + ;; *) usage 1 ;; @@ -261,7 +266,7 @@ fi # run_install $OWNERSHIP -m 0644 zones ${PREFIX}/usr/share/shorewall6/configfiles/zones -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/zones ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/zones ]; then run_install $OWNERSHIP -m 0744 zones ${PREFIX}/etc/shorewall6/zones echo "Zones file installed as ${PREFIX}/etc/shorewall6/zones" fi @@ -294,7 +299,7 @@ echo "wait4ifup installed in ${PREFIX}/usr/share/shorewall6/wait4ifup" # run_install $OWNERSHIP -m 0644 policy ${PREFIX}/usr/share/shorewall6/configfiles/policy -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/policy ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/policy ]; then run_install $OWNERSHIP -m 0600 policy ${PREFIX}/etc/shorewall6/policy echo "Policy file installed as ${PREFIX}/etc/shorewall6/policy" fi @@ -303,7 +308,7 @@ fi # run_install $OWNERSHIP -m 0644 interfaces ${PREFIX}/usr/share/shorewall6/configfiles/interfaces -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/interfaces ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/interfaces ]; then run_install $OWNERSHIP -m 0600 interfaces ${PREFIX}/etc/shorewall6/interfaces echo "Interfaces file installed as ${PREFIX}/etc/shorewall6/interfaces" fi @@ -313,7 +318,7 @@ fi # run_install $OWNERSHIP -m 0644 hosts ${PREFIX}/usr/share/shorewall6/configfiles/hosts -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/hosts ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/hosts ]; then run_install $OWNERSHIP -m 0600 hosts ${PREFIX}/etc/shorewall6/hosts echo "Hosts file installed as ${PREFIX}/etc/shorewall6/hosts" fi @@ -322,7 +327,7 @@ fi # run_install $OWNERSHIP -m 0644 rules ${PREFIX}/usr/share/shorewall6/configfiles/rules -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/rules ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/rules ]; then run_install $OWNERSHIP -m 0600 rules ${PREFIX}/etc/shorewall6/rules echo "Rules file installed as ${PREFIX}/etc/shorewall6/rules" fi @@ -342,7 +347,7 @@ fi # run_install $OWNERSHIP -m 0644 routestopped ${PREFIX}/usr/share/shorewall6/configfiles/routestopped -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/routestopped ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/routestopped ]; then run_install $OWNERSHIP -m 0600 routestopped ${PREFIX}/etc/shorewall6/routestopped echo "Stopped Routing file installed as ${PREFIX}/etc/shorewall6/routestopped" fi @@ -351,7 +356,7 @@ fi # run_install $OWNERSHIP -m 0644 maclist ${PREFIX}/usr/share/shorewall6/configfiles/maclist -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/maclist ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/maclist ]; then run_install $OWNERSHIP -m 0600 maclist ${PREFIX}/etc/shorewall6/maclist echo "MAC list file installed as ${PREFIX}/etc/shorewall6/maclist" fi @@ -372,7 +377,7 @@ echo "Helper modules file installed as ${PREFIX}/usr/share/shorewall6/helpers" # run_install $OWNERSHIP -m 0644 tcrules ${PREFIX}/usr/share/shorewall6/configfiles/tcrules -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tcrules ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tcrules ]; then run_install $OWNERSHIP -m 0600 tcrules ${PREFIX}/etc/shorewall6/tcrules echo "TC Rules file installed as ${PREFIX}/etc/shorewall6/tcrules" fi @@ -382,7 +387,7 @@ fi # run_install $OWNERSHIP -m 0644 tcinterfaces ${PREFIX}/usr/share/shorewall6/configfiles/tcinterfaces -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tcinterfaces ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tcinterfaces ]; then run_install $OWNERSHIP -m 0600 tcinterfaces ${PREFIX}/etc/shorewall6/tcinterfaces echo "TC Interfaces file installed as ${PREFIX}/etc/shorewall6/tcinterfaces" fi @@ -392,7 +397,7 @@ fi # run_install $OWNERSHIP -m 0644 tcpri ${PREFIX}/usr/share/shorewall6/configfiles/tcpri -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tcpri ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tcpri ]; then run_install $OWNERSHIP -m 0600 tcpri ${PREFIX}/etc/shorewall6/tcpri echo "TC Priority file installed as ${PREFIX}/etc/shorewall6/tcpri" fi @@ -402,7 +407,7 @@ fi # run_install $OWNERSHIP -m 0644 tos ${PREFIX}/usr/share/shorewall6/configfiles/tos -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tos ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tos ]; then run_install $OWNERSHIP -m 0600 tos ${PREFIX}/etc/shorewall6/tos echo "TOS file installed as ${PREFIX}/etc/shorewall6/tos" fi @@ -411,7 +416,7 @@ fi # run_install $OWNERSHIP -m 0644 tunnels ${PREFIX}/usr/share/shorewall6/configfiles/tunnels -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tunnels ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tunnels ]; then run_install $OWNERSHIP -m 0600 tunnels ${PREFIX}/etc/shorewall6/tunnels echo "Tunnels file installed as ${PREFIX}/etc/shorewall6/tunnels" fi @@ -420,7 +425,7 @@ fi # run_install $OWNERSHIP -m 0644 blacklist ${PREFIX}/usr/share/shorewall6/configfiles/blacklist -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/blacklist ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/blacklist ]; then run_install $OWNERSHIP -m 0600 blacklist ${PREFIX}/etc/shorewall6/blacklist echo "Blacklist file installed as ${PREFIX}/etc/shorewall6/blacklist" fi @@ -429,7 +434,7 @@ fi # run_install $OWNERSHIP -m 0644 providers ${PREFIX}/usr/share/shorewall6/configfiles/providers -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/providers ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/providers ]; then run_install $OWNERSHIP -m 0600 providers ${PREFIX}/etc/shorewall6/providers echo "Providers file installed as ${PREFIX}/etc/shorewall6/providers" fi @@ -439,7 +444,7 @@ fi # run_install $OWNERSHIP -m 0644 route_rules ${PREFIX}/usr/share/shorewall6/configfiles/route_rules -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/route_rules ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/route_rules ]; then run_install $OWNERSHIP -m 0600 route_rules ${PREFIX}/etc/shorewall6/route_rules echo "Routing rules file installed as ${PREFIX}/etc/shorewall6/route_rules" fi @@ -449,7 +454,7 @@ fi # run_install $OWNERSHIP -m 0644 tcclasses ${PREFIX}/usr/share/shorewall6/configfiles/tcclasses -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tcclasses ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tcclasses ]; then run_install $OWNERSHIP -m 0600 tcclasses ${PREFIX}/etc/shorewall6/tcclasses echo "TC Classes file installed as ${PREFIX}/etc/shorewall6/tcclasses" fi @@ -459,7 +464,7 @@ fi # run_install $OWNERSHIP -m 0644 tcdevices ${PREFIX}/usr/share/shorewall6/configfiles/tcdevices -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tcdevices ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tcdevices ]; then run_install $OWNERSHIP -m 0600 tcdevices ${PREFIX}/etc/shorewall6/tcdevices echo "TC Devices file installed as ${PREFIX}/etc/shorewall6/tcdevices" fi @@ -469,7 +474,7 @@ fi # run_install $OWNERSHIP -m 0644 notrack ${PREFIX}/usr/share/shorewall6/configfiles/notrack -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/notrack ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/notrack ]; then run_install $OWNERSHIP -m 0600 notrack ${PREFIX}/etc/shorewall6/notrack echo "Notrack file installed as ${PREFIX}/etc/shorewall6/notrack" fi @@ -483,7 +488,7 @@ echo "Default config path file installed as ${PREFIX}/usr/share/shorewall6/confi # run_install $OWNERSHIP -m 0644 init ${PREFIX}/usr/share/shorewall6/configfiles/init -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/init ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/init ]; then run_install $OWNERSHIP -m 0600 init ${PREFIX}/etc/shorewall6/init echo "Init file installed as ${PREFIX}/etc/shorewall6/init" fi @@ -492,7 +497,7 @@ fi # run_install $OWNERSHIP -m 0644 start ${PREFIX}/usr/share/shorewall6/configfiles/start -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/start ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/start ]; then run_install $OWNERSHIP -m 0600 start ${PREFIX}/etc/shorewall6/start echo "Start file installed as ${PREFIX}/etc/shorewall6/start" fi @@ -501,7 +506,7 @@ fi # run_install $OWNERSHIP -m 0644 stop ${PREFIX}/usr/share/shorewall6/configfiles/stop -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/stop ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/stop ]; then run_install $OWNERSHIP -m 0600 stop ${PREFIX}/etc/shorewall6/stop echo "Stop file installed as ${PREFIX}/etc/shorewall6/stop" fi @@ -510,7 +515,7 @@ fi # run_install $OWNERSHIP -m 0644 stopped ${PREFIX}/usr/share/shorewall6/configfiles/stopped -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/stopped ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/stopped ]; then run_install $OWNERSHIP -m 0600 stopped ${PREFIX}/etc/shorewall6/stopped echo "Stopped file installed as ${PREFIX}/etc/shorewall6/stopped" fi @@ -519,7 +524,7 @@ fi # run_install $OWNERSHIP -m 0644 accounting ${PREFIX}/usr/share/shorewall6/configfiles/accounting -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/accounting ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/accounting ]; then run_install $OWNERSHIP -m 0600 accounting ${PREFIX}/etc/shorewall6/accounting echo "Accounting file installed as ${PREFIX}/etc/shorewall6/accounting" fi @@ -528,7 +533,7 @@ fi # run_install $OWNERSHIP -m 0644 started ${PREFIX}/usr/share/shorewall6/configfiles/started -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/started ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/started ]; then run_install $OWNERSHIP -m 0600 started ${PREFIX}/etc/shorewall6/started echo "Started file installed as ${PREFIX}/etc/shorewall6/started" fi @@ -537,7 +542,7 @@ fi # run_install $OWNERSHIP -m 0644 restored ${PREFIX}/usr/share/shorewall6/configfiles/restored -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/restored ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/restored ]; then run_install $OWNERSHIP -m 0600 restored ${PREFIX}/etc/shorewall6/restored echo "Restored file installed as ${PREFIX}/etc/shorewall6/restored" fi @@ -546,7 +551,7 @@ fi # run_install $OWNERSHIP -m 0644 clear ${PREFIX}/usr/share/shorewall6/configfiles/clear -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/clear ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/clear ]; then run_install $OWNERSHIP -m 0600 clear ${PREFIX}/etc/shorewall6/clear echo "Clear file installed as ${PREFIX}/etc/shorewall6/clear" fi @@ -555,7 +560,7 @@ fi # run_install $OWNERSHIP -m 0644 isusable ${PREFIX}/usr/share/shorewall6/configfiles/isusable -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/isusable ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/isusable ]; then run_install $OWNERSHIP -m 0600 isusable ${PREFIX}/etc/shorewall6/isusable echo "Isusable file installed as ${PREFIX}/etc/shorewall/isusable" fi @@ -564,7 +569,7 @@ fi # run_install $OWNERSHIP -m 0644 refresh ${PREFIX}/usr/share/shorewall6/configfiles/refresh -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/refresh ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/refresh ]; then run_install $OWNERSHIP -m 0600 refresh ${PREFIX}/etc/shorewall6/refresh echo "Refresh file installed as ${PREFIX}/etc/shorewall6/refresh" fi @@ -573,7 +578,7 @@ fi # run_install $OWNERSHIP -m 0644 refreshed ${PREFIX}/usr/share/shorewall6/configfiles/refreshed -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/refreshed ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/refreshed ]; then run_install $OWNERSHIP -m 0600 refreshed ${PREFIX}/etc/shorewall6/refreshed echo "Refreshed file installed as ${PREFIX}/etc/shorewall6/refreshed" fi @@ -582,7 +587,7 @@ fi # run_install $OWNERSHIP -m 0644 tcclear ${PREFIX}/usr/share/shorewall6/configfiles/tcclear -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tcclear ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/tcclear ]; then run_install $OWNERSHIP -m 0600 tcclear ${PREFIX}/etc/shorewall6/tcclear echo "Tcclear file installed as ${PREFIX}/etc/shorewall6/tcclear" fi @@ -597,7 +602,7 @@ echo "Standard actions file installed as ${PREFIX}/usr/shared/shorewall6/actions # run_install $OWNERSHIP -m 0644 actions ${PREFIX}/usr/share/shorewall6/configfiles/actions -if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/actions ]; then +if [ -z "$SPARSE" -a ! -f ${PREFIX}/etc/shorewall6/actions ]; then run_install $OWNERSHIP -m 0644 actions ${PREFIX}/etc/shorewall6/actions echo "Actions file installed as ${PREFIX}/etc/shorewall6/actions" fi @@ -607,7 +612,7 @@ fi # run_install $OWNERSHIP -m 0644 Makefile-lite ${PREFIX}/usr/share/shorewall6/configfiles/Makefile -if [ -z "$CYGWIN" ]; then +if [ -z "$SPARSE" ]; then run_install $OWNERSHIP -m 0600 Makefile ${PREFIX}/etc/shorewall6/Makefile echo "Makefile installed as ${PREFIX}/etc/shorewall6/Makefile" fi @@ -686,7 +691,7 @@ if [ -z "$PREFIX" -a -n "$first_install" -a -z "$CYGWIN" ]; then echo "shorewall6 will start automatically at boot" echo "Set startup=1 in /etc/default/shorewall6 to enable" touch /var/log/shorewall6-init.log - qt mywhich perl && perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' /etc/shorewall6/shorewall6.conf + perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' /etc/shorewall6/shorewall6.conf else if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then if insserv /etc/init.d/shorewall6 ; then