Modified stop and restore procedures

scripts/lfirewall

@@ -482,28 +482,31 @@ fw_clear () {
 ##########################
 
 fw_save () {
-  if [[ ${verbose} -ge 1 ]] ; then
-    echo "$IP_TABLES-save > /etc/lfirewall/iptables.backup"
-  fi
+	if [[ ${verbose} -ge 1 ]] ; then
+	    echo "$IP_TABLES_SAVE > /etc/lfirewall/iptables.backup"
+	fi
 
-	$IP_TABLES-save > /etc/lfirewall/iptables.backup
+	$IP_TABLES_SAVE > /etc/lfirewall/iptables.backup
 }
 
 fw_restore () {
-	if [ -e /etc/iptables.backup ]; then
+	fw_clear
+	BACKUP_FILE=/etc/lfirewall/iptables.backup
+	if [ -e $BACKUP_FILE ]; then
 	  if [[ ${verbose} -ge 1 ]] ; then
-	    echo "$IP_TABLES-save > /etc/lfirewall/iptables.backup"
+	    echo "IP_TABLES_RESTORE > $BACKUP_FILE"
 	  fi
 
-		$IP_TABLES-restore < /etc/lfirewall/iptables.backup
+		$IP_TABLES_RESTORE < $BACKUP_FILE
 	fi
 }
 
 fw_test () {
 	fw_save
-	sleep 30 && echo "Restore previous Firewall rules..." && fw_restore &
+	sleep 30 && echo "Restoring previous Firewall rules" && fw_restore && echo "Done" &
 	fw_stop
 	fw_execute do_exec
+	wait $(jobs -p)
 }
 
 if [[ ${verbose} -gt 0 ]] ; then
@@ -558,9 +561,9 @@ case "$1" in
 		echo "done."
 	;;
 	test)
-		echo -n "Test Firewall rules..."
+		echo "Test Firewall rules..."
+		echo "Previous configuration will be restore in 30 seconds"
 		fw_test
-		echo -n "Previous configuration will be restore in 30 seconds"
 	;;
 	status)
 		global_status=0
@@ -586,4 +589,3 @@ case "$1" in
 		exit 1
 	;;
 esac
-exit 0