Verified Commit 2c76ba5d authored by Stefano Capitani's avatar Stefano Capitani

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

parents 84c70221 61dafad5
......@@ -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}"
......@@ -257,8 +257,8 @@ write_locale_conf(){
echo "---" > "$conf"
echo "localeGenPath: /etc/locale.gen" >> "$conf"
if ${geoip}; then
echo "geoipUrl:" >> "$conf"
echo "geoipStyle: legacy" >> "$conf"
echo "geoipUrl:" >> "$conf"
echo "geoipStyle: json" >> "$conf"
echo "region: America" >> "$conf"
echo "zone: New_York" >> "$conf"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment