extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 06:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5.21'

Browse Source
This commit is contained in:
Tom Eastep 2013-10-08 13:17:41 -07:00
commit b27e3d2fff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall-init/install.sh
View File

@ -385,7 +385,7 @@ else
mkdir -p ${DESTDIR}${SYSCONFDIR}/network/if-down.d mkdir -p ${DESTDIR}${SYSCONFDIR}/network/if-down.d
elif [ $HOST = gentoo ]; then elif [ $HOST = gentoo ]; then
# Gentoo does not support if-{up,down}.d # Gentoo does not support if-{up,down}.d
return /bin/true
else else
mkdir -p ${DESTDIR}/etc/NetworkManager/dispatcher.d mkdir -p ${DESTDIR}/etc/NetworkManager/dispatcher.d
fi fi
@ -467,7 +467,7 @@ if [ -z "$DESTDIR" ]; then
elif [ $HOST = gentoo ]; then elif [ $HOST = gentoo ]; then
# On Gentoo, a service must be enabled manually by the user, # On Gentoo, a service must be enabled manually by the user,
# not by the installer # not by the installer
return /bin/true
else else
if [ -n "$SYSTEMD" ]; then if [ -n "$SYSTEMD" ]; then
if systemctl enable shorewall-init.service; then if systemctl enable shorewall-init.service; then

4
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -810,7 +810,7 @@ CEOF
emit "run_ip route replace $gateway src $address dev $physical ${mtu}"; emit "run_ip route replace $gateway src $address dev $physical ${mtu}";
emit "run_ip route replace $gateway src $address dev $physical ${mtu}table $id $realm"; emit "run_ip route replace $gateway src $address dev $physical ${mtu}table $id $realm";
} else { } else {
emit "qt \$IP -6 route add $gateway src $address dev $physical ${mtu}" if $hostroute; emit "qt \$IP -6 route add $gateway src $address dev $physical ${mtu}";
emit "qt \$IP -6 route del $gateway src $address dev $physical ${mtu}table $id $realm"; emit "qt \$IP -6 route del $gateway src $address dev $physical ${mtu}table $id $realm";
emit "run_ip route add $gateway src $address dev $physical ${mtu}table $id $realm"; emit "run_ip route add $gateway src $address dev $physical ${mtu}table $id $realm";
} }
@ -828,7 +828,7 @@ CEOF
emit ''; emit '';
if ( $gateway ) { if ( $gateway ) {
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
emit qq(run_ip route replace $gateway/32 dev $physical table $id); emit qq(run_ip route replace $gateway/32 dev $physical table $id) if $hostroute;
emit qq(run_ip route add default via $gateway src $address dev $physical table $id metric $number); emit qq(run_ip route add default via $gateway src $address dev $physical table $id metric $number);
} else { } else {
emit qq(qt \$IP -6 route del default via $gateway src $address dev $physical table $id metric $number); emit qq(qt \$IP -6 route del default via $gateway src $address dev $physical table $id metric $number);