Honor -n option when restoring routing

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4766 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-10-30 19:17:20 +00:00
parent c5f6d11acf
commit 5f8b002909

View File

@ -1287,27 +1287,29 @@ get_device_mtu() # $1 = device
# #
undo_routing() { undo_routing() {
# if [ -z "$NOROUTES" ]; then
# Restore rt_tables database #
# # Restore rt_tables database
if [ -f ${VARDIR}/rt_tables ]; then #
cp -f ${VARDIR}/rt_tables /etc/iproute2/ && progress_message "/etc/iproute2/rt_tables database restored" if [ -f ${VARDIR}/rt_tables ]; then
rm -f ${VARDIR}/rt_tables cp -f ${VARDIR}/rt_tables /etc/iproute2/ && progress_message "/etc/iproute2/rt_tables database restored"
fi rm -f ${VARDIR}/rt_tables
# fi
# Restore the rest of the routing table #
# # Restore the rest of the routing table
if [ -f ${VARDIR}/undo_routing ]; then #
. ${VARDIR}/undo_routing if [ -f ${VARDIR}/undo_routing ]; then
progress_message "Shorewall-generated routing tables and routing rules removed" . ${VARDIR}/undo_routing
rm -f ${VARDIR}/undo_routing progress_message "Shorewall-generated routing tables and routing rules removed"
rm -f ${VARDIR}/undo_routing
fi
fi fi
} }
restore_default_route() { restore_default_route() {
if [ -f ${VARDIR}/default_route ]; then if [ -z "$NOROUTES" -a -f ${VARDIR}/default_route ]; then
local default_route= route local default_route= route
while read route ; do while read route ; do