From 1a49f3ef3570306a64fb3fe05b7d9d7ac4afbb84 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 15 Sep 2016 23:05:15 +0200
Subject: [PATCH] util-iso-cal: activate geoip

---
 lib/util-iso-calamares.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 92ffef0..ab5d2d7 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -231,7 +231,7 @@ get_yaml(){
 	else
 		args+=('netinstall')
 	fi
-	[[ ${initsys} == 'openrc' ]] && args+=("${initsys}")
+	args+=("${initsys}")
 	[[ ${edition} == 'sonar' ]] && args+=("${edition}")
 	for arg in ${args[@]};do
 		yaml=${yaml:-}${yaml:+-}${arg}
@@ -257,11 +257,12 @@ write_locale_conf(){
 	local conf="$1/etc/calamares/modules/locale.conf"
 	msg2 "Writing %s ..." "${conf##*/}"
 	echo "---" > "$conf"
-	echo "region: America" >> "$conf"
-	echo "zone: New_York" >> "$conf"
 	echo "localeGenPath: /etc/locale.gen" >> "$conf"
 	if ${geoip};then
-		echo "geoipUrl: freegeoip.net" >> "$conf"
+        echo "geoipUrl: freegeoip.net" >> "$conf"
+	else
+		echo "region: Europe" >> "$conf"
+        echo "zone: London" >> "$conf"
 	fi
 }