From a321ec6225fea4b25d9217933c0737a392e502b3 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 7 Dec 2009 14:44:46 -0800 Subject: [PATCH] Fix DONT_LOAD vs 'reload -c' --- Shorewall/shorewall | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 7055736a5..48737b8ef 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1231,8 +1231,10 @@ reload_command() # $* = original arguments less the command. ensure_config_path fi + [ -n "$DONT_LOAD" ] && DONT_LOAD="$(echo $DONT_LOAD | tr ',' ' ')" + progress_message "Getting Capabilities on system $system..." - if ! rsh_command "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IPTABLES=$IPTABLES /usr/share/shorewall-lite/shorecap" > $directory/capabilities; then + if ! rsh_command "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IPTABLES=$IPTABLES DONT_LOAD=\"$DONT_LOAD\" /usr/share/shorewall-lite/shorecap" > $directory/capabilities; then fatal_error "ERROR: Capturing capabilities on system $system failed" fi fi