forked from mirrored-repos/manjaro-tools
[util-yaml] adopt to CAL 3.2.11
This commit is contained in:
parent
1b32aa25b8
commit
dfbcb1c2bd
1 changed files with 10 additions and 3 deletions
|
@ -187,6 +187,12 @@ write_welcome_conf(){
|
||||||
if ${netinstall}; then
|
if ${netinstall}; then
|
||||||
echo " - internet" >> "$conf"
|
echo " - internet" >> "$conf"
|
||||||
fi
|
fi
|
||||||
|
if ${geoip}; then
|
||||||
|
echo 'geoip:' >> "$conf"
|
||||||
|
echo ' style: "json"' >> "$conf"
|
||||||
|
echo ' url: "https://geoip.kde.org/v1/calamares"' >> "$conf"
|
||||||
|
echo ' selector: ""' >> "$conf"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
write_mhwdcfg_conf(){
|
write_mhwdcfg_conf(){
|
||||||
|
@ -257,9 +263,10 @@ write_locale_conf(){
|
||||||
echo "---" > "$conf"
|
echo "---" > "$conf"
|
||||||
echo "localeGenPath: /etc/locale.gen" >> "$conf"
|
echo "localeGenPath: /etc/locale.gen" >> "$conf"
|
||||||
if ${geoip}; then
|
if ${geoip}; then
|
||||||
echo "geoipUrl: https://get.geojs.io/v1/ip/geo.json" >> "$conf"
|
echo 'geoip:' >> "$conf"
|
||||||
echo "geoipStyle: json" >> "$conf"
|
echo ' style: "json"' >> "$conf"
|
||||||
echo "geoipSelector: timezone" >> "$conf"
|
echo ' url: "https://geoip.kde.org/v1/calamares"' >> "$conf"
|
||||||
|
echo ' selector: ""' >> "$conf"
|
||||||
else
|
else
|
||||||
echo "region: America" >> "$conf"
|
echo "region: America" >> "$conf"
|
||||||
echo "zone: New_York" >> "$conf"
|
echo "zone: New_York" >> "$conf"
|
||||||
|
|
Loading…
Reference in a new issue