mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-23 06:38:53 +01:00
Rename rtrules to route_rules
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3789 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
af07daa4ef
commit
5ea0b6bf94
@ -1308,7 +1308,7 @@ __EOF__
|
||||
[ "$n" = "$1" ] && return 0
|
||||
done
|
||||
|
||||
fatal_error "Unknown provider $1 in rtrule \"$rule\""
|
||||
fatal_error "Unknown provider $1 in route rule \"$rule\""
|
||||
}
|
||||
|
||||
add_an_rtrule()
|
||||
@ -1395,12 +1395,12 @@ __EOF__
|
||||
__EOF__
|
||||
done
|
||||
|
||||
f=$(find_file rtrules)
|
||||
f=$(find_file route_rules)
|
||||
|
||||
if [ -f $f ]; then
|
||||
strip_file rtrules $f
|
||||
strip_file route_rules $f
|
||||
|
||||
if [ -s $TMP_DIR/rtrules ]; then
|
||||
if [ -s $TMP_DIR/route_rules ]; then
|
||||
progress_message2 "$DOING $f..."
|
||||
|
||||
save_command
|
||||
@ -1409,7 +1409,7 @@ __EOF__
|
||||
expandv source dest provider priority
|
||||
rule="$source $dest $priority $provider"
|
||||
add_an_rtrule
|
||||
done < $TMP_DIR/rtrules
|
||||
done < $TMP_DIR/route_rules
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
@ -445,9 +445,9 @@ fi
|
||||
#
|
||||
# Install the Route Rules file
|
||||
#
|
||||
if [ ! -f ${PREFIX}/etc/shorewall/rtrules ]; then
|
||||
run_install $OWNERSHIP -m 0600 rtrules ${PREFIX}/etc/shorewall/rtrules
|
||||
echo "Routing rules file installed as ${PREFIX}/etc/shorewall/rtrules"
|
||||
if [ ! -f ${PREFIX}/etc/shorewall/route_rules ]; then
|
||||
run_install $OWNERSHIP -m 0600 route_rules ${PREFIX}/etc/shorewall/route_rules
|
||||
echo "Routing rules file installed as ${PREFIX}/etc/shorewall/route_rules"
|
||||
fi
|
||||
|
||||
#
|
||||
|
@ -49,6 +49,9 @@ Other changes in 3.2.0 Beta 5
|
||||
Use "shorewall restart" instead if you need to reprocess the
|
||||
tcrules, tcdevices and tcclasses files.
|
||||
|
||||
2) Per a suggestion by Steve Heber, the rtrules file has been renamed
|
||||
route_rules.
|
||||
|
||||
Migration Considerations:
|
||||
|
||||
1) If you are upgrading from Shorewall 2.x, it is essential that you read
|
||||
@ -444,9 +447,9 @@ New Features:
|
||||
CONTINUE policy.
|
||||
|
||||
10) Shorewall now includes support for explicit routing rules when the
|
||||
/etc/shorewall/providers file is used. A new file, /etc/shorewall/rtrules
|
||||
can be used to add routing rules based on packet source and/or
|
||||
destination.
|
||||
/etc/shorewall/providers file is used. A new file,
|
||||
/etc/shorewall/route_rules can be used to add routing rules based on
|
||||
packet source and/or destination.
|
||||
|
||||
The file has the following columns:
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Shorewall version 3.2 - rtrules File
|
||||
# Shorewall version 3.2 - route_rules File
|
||||
#
|
||||
# /etc/shorewall/rtrules
|
||||
# /etc/shorewall/route_rules
|
||||
#
|
||||
# Entries in this file cause traffic to be routed to one of the
|
||||
# providers listed in /etc/shorewall/providers.
|
@ -97,7 +97,7 @@ fi
|
||||
%attr(0600,root,root) %config(noreplace) /etc/shorewall/continue
|
||||
%attr(0600,root,root) %config(noreplace) /etc/shorewall/started
|
||||
%attr(0600,root,root) %config(noreplace) /etc/shorewall/providers
|
||||
%attr(0600,root,root) %config(noreplace) /etc/shorewall/rtrules
|
||||
%attr(0600,root,root) %config(noreplace) /etc/shorewall/route_rules
|
||||
%attr(0600,root,root) %config(noreplace) /etc/shorewall/tcclasses
|
||||
%attr(0600,root,root) %config(noreplace) /etc/shorewall/tcdevices
|
||||
%attr(0600,root,root) /etc/shorewall/Makefile
|
||||
@ -180,6 +180,8 @@ fi
|
||||
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
|
||||
|
||||
%changelog
|
||||
* Fri Apr 14 2006 Tom Eastep tom@shorewall.net
|
||||
- Renamed rtrules to route_rules
|
||||
* Sun Apr 02 2006 Tom Eastep tom@shorewall.net
|
||||
- Added rtrules file
|
||||
- Updated to 3.2.0-0Beta4
|
||||
|
Loading…
Reference in New Issue
Block a user