Merge remote-tracking branch 'upstream/stable-0.15.x' into stable-0.15.x

lib/util-iso-boot.sh

@@ -87,6 +87,9 @@ prepare_grub(){
     cp ${data}/unicode.pf2 ${grub}
     cp -r ${data_live}/{locales,tz} ${grub}
 
+    msg2 "Set menu_show_once=1 in '${grub}/grubenv'"
+    grub-editenv ${grub}/grubenv set menu_show_once=1
+
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="$2/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${efi_img}"

lib/util-yaml.sh

@@ -257,8 +257,8 @@ write_locale_conf(){
     echo "---" > "$conf"
     echo "localeGenPath: /etc/locale.gen" >> "$conf"
     if ${geoip}; then
-        echo "geoipUrl: https://geoip.tools/v1" >> "$conf"
-        echo "geoipStyle: legacy" >> "$conf"
+        echo "geoipUrl: https://geoip.kde.org/v1/calamares" >> "$conf"
+        echo "geoipStyle: json" >> "$conf"
     else
         echo "region: America" >> "$conf"
         echo "zone: New_York" >> "$conf"