mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-28 21:51:46 +02:00
Make Debian install via the tarball more like the .deb
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3161 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
1057af6b9b
commit
9d61e79412
@ -32,6 +32,8 @@ Changes in 3.0.3
|
|||||||
|
|
||||||
16) Fixed bug in tcrules processing (interface name in SOURCE column).
|
16) Fixed bug in tcrules processing (interface name in SOURCE column).
|
||||||
|
|
||||||
|
17) Create /var/log/shorewall-init.log when installing on Debian.
|
||||||
|
|
||||||
Changes in 3.0.2
|
Changes in 3.0.2
|
||||||
|
|
||||||
1) Typos in the Samples corrected.
|
1) Typos in the Samples corrected.
|
||||||
|
@ -33,6 +33,32 @@ usage() # $1 = exit status
|
|||||||
exit $1
|
exit $1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
split() {
|
||||||
|
local ifs=$IFS
|
||||||
|
IFS=:
|
||||||
|
set -- $1
|
||||||
|
echo $*
|
||||||
|
IFS=$ifs
|
||||||
|
}
|
||||||
|
|
||||||
|
qt()
|
||||||
|
{
|
||||||
|
"$@" >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
mywhich() {
|
||||||
|
local dir
|
||||||
|
|
||||||
|
for dir in $(split $PATH); do
|
||||||
|
if [ -x $dir/$1 ]; then
|
||||||
|
echo $dir/$1
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
|
||||||
run_install()
|
run_install()
|
||||||
{
|
{
|
||||||
if ! install $*; then
|
if ! install $*; then
|
||||||
@ -207,7 +233,6 @@ echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
|
|||||||
#
|
#
|
||||||
if [ -n "$DEBIAN" ]; then
|
if [ -n "$DEBIAN" ]; then
|
||||||
install_file_with_backup init.debian.sh /etc/init.d/shorewall 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
|
install_file_with_backup init.debian.sh /etc/init.d/shorewall 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
|
||||||
|
|
||||||
elif [ -n "$ARCHLINUX" ]; then
|
elif [ -n "$ARCHLINUX" ]; then
|
||||||
install_file_with_backup init.archlinux.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
|
install_file_with_backup init.archlinux.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
|
||||||
|
|
||||||
@ -587,6 +612,8 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then
|
|||||||
echo
|
echo
|
||||||
echo "shorewall will start automatically at boot"
|
echo "shorewall will start automatically at boot"
|
||||||
echo "Set startup=1 in /etc/default/shorewall to enable"
|
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/' /etc/shorewall/shorewall.conf
|
||||||
else
|
else
|
||||||
if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then
|
if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then
|
||||||
if insserv /etc/init.d/shorewall ; then
|
if insserv /etc/init.d/shorewall ; then
|
||||||
|
@ -71,6 +71,11 @@ Problems Corrected in 3.0.3
|
|||||||
7) Specifying an interface name in the SOURCE column of /etc/shorewall/tcrules
|
7) Specifying an interface name in the SOURCE column of /etc/shorewall/tcrules
|
||||||
resulted in a startup error.
|
resulted in a startup error.
|
||||||
|
|
||||||
|
8) When the 'install.sh' script is used on Debian, it now creates
|
||||||
|
/var/log/shorewall-init.log. And if perl is installed on the system then
|
||||||
|
STARTUP_ENABLED=Yes is specified in shorewall.conf (the user must still
|
||||||
|
set startup=1 in /etc/default/shorewall).
|
||||||
|
|
||||||
New Features in 3.0.3
|
New Features in 3.0.3
|
||||||
|
|
||||||
1) A "shorewall show macros" command has been added. This command displays
|
1) A "shorewall show macros" command has been added. This command displays
|
||||||
|
Loading…
x
Reference in New Issue
Block a user