holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Restore RPM RedHat compatibility

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-05-27 06:49:49 -07:00
parent d0bf4e016c
commit 3125a4d0d3
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-init/install.sh
View File

@ -238,6 +238,7 @@ else
if [ -n "$PREFIX" ]; then
mkdir -p ${PREFIX}/etc/sysconfig
if [ -z "$RPM" ]; then
if [ -n "$SUSE" ]; then
mkdir -p ${PREFIX}/etc/sysconfig/network/if-up.d
mkdir -p ${PREFIX}/etc/sysconfig/network/if-down.d
@ -245,6 +246,7 @@ else
mkdir -p ${PREFIX}/etc/NetworkManager/dispatcher.d
fi
fi
fi
if [ -d ${PREFIX}/etc/sysconfig -a ! -f ${PREFIX}/etc/sysconfig/shorewall-init ]; then
install_file sysconfig ${PREFIX}/etc/sysconfig/shorewall-init 0644

22
Shorewall-init/shorewall-init.spec
View File

@ -48,20 +48,28 @@ if [ $1 -eq 1 ]; then
elif [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --add shorewall-init;
fi
fi
if [ ! -f /etc/SuSE-release ]; then
if [ -f /etc/SuSE-release ]; then
cp -af /usr/share/shorewall-init/ifupdown /etc/sysconfig/network/if-up.d/shorewall
cp -af /usr/share/shorewall-init/ifupdown /etc/sysconfig/network/if-down.d/shorewall
else
if [ -f /sbin/ifup-local -o -f /sbin/ifdown-local ]; then
if ! grep -q Shorewall /sbin/ifup-local || ! grep -q Shorewall /sbin/ifdown-local; then
echo "WARNING: /sbin/ifup-local and/or /sbin/ifdown-local already exist; ifup/ifdown events will not be handled" >&2
else
cp -a /usr/share/shorewall-init/ifupdown /sbin/ifup-local
cp -a /usr/share/shorewall-init/ifupdown /sbin/ifdown-local
cp -af /usr/share/shorewall-init/ifupdown /sbin/ifup-local
cp -af /usr/share/shorewall-init/ifupdown /sbin/ifdown-local
fi
else
cp -af /usr/share/shorewall-init/ifupdown /sbin/ifup-local
cp -af /usr/share/shorewall-init/ifupdown /sbin/ifdown-local
fi
if [ -d /etc/NetworkManager/dispatcher.d/ ]; then
cp -af /usr/share/shorewall-init/ifupdown /etc/NetworkManager/dispatcher.d/01-shorewall
fi
fi
fi
%preun
@ -72,8 +80,8 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del shorewall-init
fi
grep -q Shorewall /sbin/ifup-local && rm -f /sbin/ifup-local
grep -q Shorewall /sbin/ifdown-local && rm -f /sbin/ifdown-local
[ -f /sbin/ifup-local ] && grep -q Shorewall /sbin/ifup-local && rm -f /sbin/ifup-local
[ -f /sbin/ifdown-local ] && grep -q Shorewall /sbin/ifdown-local && rm -f /sbin/ifdown-local
rm -f /etc/NetworkManager/dispatcher.d/01-shorewall
fi
@ -81,8 +89,6 @@ fi
%files
%defattr(0644,root,root,0755)
%attr(0644,root,root) %config(noreplace) /etc/sysconfig/shorewall-init
%attr(0544,root,root) /etc/sysconfig/network/if-up.d/shorewall
%attr(0544,root,root) /etc/sysconfig/network/if-down.d/shorewall
%attr(0544,root,root) /etc/init.d/shorewall-init
%attr(0755,root,root) %dir /usr/share/shorewall-init

3
Shorewall/releasenotes.txt
View File

@ -356,8 +356,7 @@ None.
interfaces remaining in the up state, then the firewall is stopped.
Shorewall-init may be installed on Debian-based systems, SuSE-based
systems and RedHat-based systems. The RPM included with the release
may only be installed on SuSE-based systems.
systems and RedHat-based systems.
On Debian-based systems, during system shutdown the firewall is
opened prior to network shutdown (/etc/init.d/shorewall stop