shorewall-devel March 2011 archive
Main Archive Page > Month Archives  > shorewall-devel archives
shorewall-devel: [Shorewall-devel] [PATCH 02/10] Shorewall: Move

[Shorewall-devel] [PATCH 02/10] Shorewall: Move wait4ifup to LIBEXEC

From: Jonathan G. Underwood <jonathan.underwood_at_nospam>
Date: Mon Mar 21 2011 - 00:29:28 GMT
To: shorewall-devel@lists.sourceforge.net

--- Shorewall/default.debian | 2 +- Shorewall/init.debian.sh | 2 +- Shorewall/install.sh | 4 ++-- Shorewall/shorewall.spec | 2 +- Shorewall/wait4ifup | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Shorewall/default.debian b/Shorewall/default.debian index 828ecc9..31a4f76 100644 --- a/Shorewall/default.debian +++ b/Shorewall/default.debian @@ -42,5 +42,5 @@ SRWL=/sbin/shorewall # Name of the wait4ifup script Change this if you use the installer to install in # another location # -WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup +WAIT_FOR_IFUP=/usr/libexec/shorewall/wait4ifup # EOF diff --git a/Shorewall/init.debian.sh b/Shorewall/init.debian.sh index a4d6c34..969bbc3 100755 --- a/Shorewall/init.debian.sh +++ b/Shorewall/init.debian.sh @@ -12,7 +12,7 @@ SRWL=/sbin/shorewall SRWL_OPTS="-tvv" -WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup +WAIT_FOR_IFUP=/usr/libexec/shorewall/wait4ifup INITLOG=/var/log/shorewall-init.log if [ "$(id -u)" != "0" ] diff --git a/Shorewall/install.sh b/Shorewall/install.sh index e6663a6..50eca57 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -450,10 +450,10 @@ delete_file ${DESTDIR}/usr/share/shorewall/prog.footer # Install wait4ifup # -install_file wait4ifup ${DESTDIR}${SHARE}shorewall/wait4ifup 0755 +install_file wait4ifup ${DESTDIR}${LIBEXEC}shorewall/wait4ifup 0755 echo -echo "wait4ifup installed in ${DESTDIR}${SHARE}shorewall/wait4ifup" +echo "wait4ifup installed in ${DESTDIR}${LIBEXEC}shorewall/wait4ifup" # # Install the policy file diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 894f54f..5b65d52 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -104,7 +104,7 @@ fi %attr(0644,root,root) /usr/share/shorewall/modules* %attr(0644,root,root) /usr/share/shorewall/helpers %attr(0644,root,root) /usr/share/shorewall/configpath -%attr(0755,root,root) /usr/share/shorewall/wait4ifup +%attr(0755,root,root) /usr/libexec/shorewall/wait4ifup %attr(755,root,root) /usr/share/shorewall/compiler.pl %attr(755,root,root) /usr/share/shorewall/getparams diff --git a/Shorewall/wait4ifup b/Shorewall/wait4ifup index 400c420..9469810 100755 --- a/Shorewall/wait4ifup +++ b/Shorewall/wait4ifup @@ -6,7 +6,7 @@ # # (c) 2007 - Tom Eastep (teastep@shorewall.net) # -# This file is installed in /usr/share/shorewall/wait4ifup +# This file is installed in /usr/libexec/shorewall/wait4ifup # # Shorewall documentation is available at http://www.shorewall.net # -- 1.7.4 ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Shorewall-devel mailing list Shorewall-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-devel