[PATCH 1/2] convert-to-location: Fix double patch declaration

[PATCH 1/2] convert-to-location: Fix double patch declaration

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 src/scripts/convert-to-location | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/convert-to-location b/src/scripts/convert-to-location
index 2d830078a..db61d3c79 100755
--- a/src/scripts/convert-to-location
+++ b/src/scripts/convert-to-location
@@ -36,7 +36,7 @@ if [ -f "$FW_CONF_DIR/geoipblock" ]; then
 	for file in "$FW_CONF_DIR/config" "$FW_CONF_DIR/input" "$FW_CONF_DIR/outgoing"; do
 		# Convert pattern which indicates location based rules to the new
 		# ones.
-		sed -i 's/cust_geoip/cust_location/g' "$FW_CONF_DIR/$file"
+		sed -i 's/cust_geoip/cust_location/g' "$file"
 	done
 
 	# Rename indicator for location based groups to the new one.
-- 
2.20.1

[PATCH 2/2] convert-to-location: Regenerate firewall chains.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

The firewall chain for location based rules has been renamed to
LOCATIONBLOCK and therefore the fiewall needs to be restarted and
the chains regenerated.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 src/scripts/convert-to-location | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/scripts/convert-to-location b/src/scripts/convert-to-location
index db61d3c79..9149b854d 100755
--- a/src/scripts/convert-to-location
+++ b/src/scripts/convert-to-location
@@ -44,6 +44,9 @@ if [ -f "$FW_CONF_DIR/geoipblock" ]; then
 
 	# Rename file to the new name.
 	mv "$HOSTS_CONF_DIR/customgeoipgrp" "$HOSTS_CONF_DIR/customlocationgrp"
+
+	# Regenerate firewall chains.
+	/etc/init.d/firewall restart
 fi
 
 # Finished.
-- 
2.20.1