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

Issue message when adding an IP address

Browse Source 
Don't die on lockfile timeout


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@148 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2002-07-23 23:09:14 +00:00
parent 1412f0d698
commit 621e8df85b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/firewall
View File

@ -2607,6 +2607,7 @@ add_ip_aliases() # $* = addresses and devices
run_ip addr add ${external}${val} dev $interface
echo "$external $interface" >> ${STATEDIR}/nat
echo " IP Address $external added to interface $interface"
}
while [ $# -gt 0 ]; do
@ -3187,7 +3188,7 @@ define_firewall() # $1 = Command (Start or Restart)
activate_rules
[ -n "$aliases_to_add" ] && \
echo "Adding IP Aliases..." && \
echo "Adding IP Addresses..." && \
add_ip_aliases $aliases_to_add
run_user_exit start

4
Shorewall/functions
View File

@ -124,7 +124,7 @@ mutex_on()
[ -d $STATEDIR ] || mkdir -p $STATEDIR
if qt which lockfile; then
lockfile -030 -r1 ${lockf} || exit 2
lockfile -030 -r1 ${lockf} || rm -f ${lockf}
else
while [ -f ${lockf} -a ${try} -lt ${max} ] ; do
sleep ${int}
@ -136,7 +136,7 @@ mutex_on()
echo $$ > ${lockf}
else
echo "Giving up on lock file ${lockf}" >&2
exit 2
rm -f ${lockf}
fi
fi
}