root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

util-iso-cal: activate geoip

Browse source
This commit is contained in:
udeved 2016-09-15 23:05:15 +02:00
parent c82a221b65
commit 1a49f3ef35
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/util-iso-calamares.sh
View file

@ -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
}