From e99949a7001ec3c7639c28f3bd96aae1524fa1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 2 Oct 2018 20:12:02 +0200 Subject: [PATCH 1/7] [util-iso-boot] set grubenv for grub-quiet --- lib/util-iso-boot.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh index 18e3e33..2057eda 100644 --- a/lib/util-iso-boot.sh +++ b/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}" From 0104b5c84d30ed6fc7dfe681e2f9b962db8e857c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 15 Oct 2018 21:24:04 +0200 Subject: [PATCH 2/7] [util-yaml] use different geoip service --- lib/util-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index a1a68e2..96399d7 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -257,7 +257,7 @@ write_locale_conf(){ echo "---" > "$conf" echo "localeGenPath: /etc/locale.gen" >> "$conf" if ${geoip}; then - echo "geoipUrl: https://geoip.tools/v1" >> "$conf" + echo "geoipUrl: http://ip-api.com/json" >> "$conf" echo "geoipStyle: legacy" >> "$conf" else echo "region: America" >> "$conf" From c6ec757f1769509c1be42143db7bf256d4e3339b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 21 Oct 2018 08:52:19 +0200 Subject: [PATCH 3/7] [util-yaml] update ip path --- lib/util-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index 96399d7..34b5819 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -257,7 +257,7 @@ write_locale_conf(){ echo "---" > "$conf" echo "localeGenPath: /etc/locale.gen" >> "$conf" if ${geoip}; then - echo "geoipUrl: http://ip-api.com/json" >> "$conf" + echo "geoipUrl: http://ip-api.com" >> "$conf" echo "geoipStyle: legacy" >> "$conf" else echo "region: America" >> "$conf" From 6c1636e9c21492e2bb75ac08963d1dd11a39517b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 21 Oct 2018 09:11:32 +0200 Subject: [PATCH 4/7] [util-yaml] use kde.org service --- lib/util-yaml.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index 34b5819..a4a280d 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -257,8 +257,8 @@ write_locale_conf(){ echo "---" > "$conf" echo "localeGenPath: /etc/locale.gen" >> "$conf" if ${geoip}; then - echo "geoipUrl: http://ip-api.com" >> "$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" From a0ea27a56544135980c3f1def118bdd3ca7c49fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 3 Nov 2018 07:59:14 +0100 Subject: [PATCH 5/7] [util-iso] update xorriso cmds for v1.4.8 --- lib/util-iso.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 3bb9e0a..f7696a3 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -178,6 +178,7 @@ assemble_iso(){ --sort-weight 0 / \ --sort-weight 1 /boot \ --grub2-mbr ${iso_root}/boot/grub/i386-pc/boot_hybrid.img \ + -iso_mbr_part_type 0x00 \ -partition_offset 16 \ -b boot/grub/i386-pc/eltorito.img \ -c boot.catalog \ @@ -189,9 +190,6 @@ assemble_iso(){ -iso-level 3 \ -o ${iso_dir}/${iso_file} \ ${iso_root}/ - -# arg to add with xorriso-1.4.7 -# -iso_mbr_part_type 0x00 } # Build ISO From 97e0601cb48397df9c7a2b2ee239d456bedcb391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 3 Nov 2018 08:48:20 +0100 Subject: [PATCH 6/7] [util-iso] use full-iso9660-filenames --- lib/util-iso.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index f7696a3..bcdd62c 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -187,6 +187,7 @@ assemble_iso(){ -append_partition 2 0xef ${iso_root}/efi.img \ -e --interval:appended_partition_2:all:: \ -no-emul-boot \ + -full-iso9660-filenames \ -iso-level 3 \ -o ${iso_dir}/${iso_file} \ ${iso_root}/ From 2559ff5bb2d07c28ef38c120f35fc928cc0d43c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 3 Nov 2018 08:56:03 +0100 Subject: [PATCH 7/7] [util.sh] use linux419 by default --- lib/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.sh b/lib/util.sh index 678eff3..ade9100 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -315,7 +315,7 @@ init_buildiso(){ iso_label=$(get_iso_label "${dist_branding}${dist_release//.}") - [[ -z ${kernel} ]] && kernel="linux414" + [[ -z ${kernel} ]] && kernel="linux419" [[ -z ${gpgkey} ]] && gpgkey=''