From deb24afe44145661bccd3787fe1f6d3d697ab87f Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Wed, 20 Jan 2021 23:55:17 -0500
Subject: [PATCH] cleaned up boot entries in relchk, added todo for bootsync

---
 TODO                       |  3 ---
 tpl/arch_grub.conf.j2      | 22 ++++++++++++++++------
 tpl/sysresccd_grub.conf.j2 | 15 +++++----------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/TODO b/TODO
index 1c9ac52..9cf9fb3 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,3 @@
 - GPG sig checking
 - incorporate bootsync integration
 - config file... i think i unfortunately need it
-- insmod loopback before setting root
-
-fallback works but main one doesn't for bootsync... main one keeps using grub.cfg from /boot/grub instead of /mnt/boot1/grub (but fallback doesn't for some reason)
diff --git a/tpl/arch_grub.conf.j2 b/tpl/arch_grub.conf.j2
index e865314..ca3237f 100644
--- a/tpl/arch_grub.conf.j2
+++ b/tpl/arch_grub.conf.j2
@@ -9,20 +9,30 @@ exec tail -n +3 $0
 submenu 'Arch Install ISO' {
 
 	menuentry 'Default Options' {
-		search --no-floppy --fs-uuid --set=root {{ disk_uuid }}
+		load_video
+		insmod gzio
+		insmod part_gpt
+		insmod part_msdos
+		insmod ext2
+		insmod loopback
+		search --no-floppy --fs-uuid {{ disk_uuid }} --set=root
 		set isofile='{{ iso_path }}'
-		probe -u $root --set=imgdevuuid
-		set imgdevpath="/dev/disk/by-uuid/$imgdevuuid"
+		set imgdevpath="/dev/disk/by-uuid/{{ disk_uuid }}"
 		loopback loop (${root})/${isofile}
 		linux (loop)/arch/boot/x86_64/vmlinuz-linux archisobasedir=arch img_dev=$imgdevpath img_loop=${isofile} earlymodules=loop
 		initrd (loop)/arch/boot/intel-ucode.img (loop)/arch/boot/amd-ucode.img (loop)/arch/boot/x86_64/initramfs-linux.img
 	}
 
 	menuentry 'Accessibility mode' {
-		search --no-floppy --fs-uuid --set=root {{ disk_uuid }}
+		load_video
+		insmod gzio
+		insmod part_gpt
+		insmod part_msdos
+		insmod ext2
+		insmod loopback
+		search --no-floppy --fs-uuid {{ disk_uuid }} --set=root
 		set isofile='{{ iso_path }}'
-		probe -u $root --set=imgdevuuid
-		set imgdevpath="/dev/disk/by-uuid/$imgdevuuid"
+		set imgdevpath="/dev/disk/by-uuid/{{ disk_uuid }}"
 		loopback loop (${root})/${isofile}
 		linux (loop)/arch/boot/x86_64/vmlinuz-linux archisobasedir=arch img_dev=$imgdevpath img_loop=${isofile} earlymodules=loop accessibility=on
 		initrd (loop)/arch/boot/intel-ucode.img (loop)/arch/boot/amd-ucode.img (loop)/arch/boot/x86_64/initramfs-linux.img
diff --git a/tpl/sysresccd_grub.conf.j2 b/tpl/sysresccd_grub.conf.j2
index 522a702..37f36ca 100644
--- a/tpl/sysresccd_grub.conf.j2
+++ b/tpl/sysresccd_grub.conf.j2
@@ -32,8 +32,7 @@ submenu 'System Rescue CD' {
 		insmod loopback
 		search --no-floppy --fs-uuid {{ disk_uuid }} --set=root
 		set isofile='{{ iso_path }}'
-		probe -u ${root} --set=imgdevuuid
-		set imgdevpath="/dev/disk/by-uuid/${imgdevuuid}"
+		set imgdevpath="/dev/disk/by-uuid/{{ disk_uuid }}"
 		loopback loop (${root})/${isofile}
 		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_dev=${imgdevpath} img_loop=${isofile} earlymodules=loop copytoram
 		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img
@@ -48,8 +47,7 @@ submenu 'System Rescue CD' {
 		insmod loopback
 		search --no-floppy --fs-uuid {{ disk_uuid }} --set=root
 		set isofile='{{ iso_path }}'
-		probe -u ${root} --set=imgdevuuid
-		set imgdevpath="/dev/disk/by-uuid/${imgdevuuid}"
+		set imgdevpath="/dev/disk/by-uuid/{{ disk_uuid }}"
 		loopback loop (${root})/${isofile}
 		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_dev=${imgdevpath} img_loop=${isofile} earlymodules=loop checksum
 		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img
@@ -64,8 +62,7 @@ submenu 'System Rescue CD' {
 		insmod loopback
 		search --no-floppy --fs-uuid {{ disk_uuid }} --set=root
 		set isofile='{{ iso_path }}'
-		probe -u ${root} --set=imgdevuuid
-		set imgdevpath="/dev/disk/by-uuid/${imgdevuuid}"
+		set imgdevpath="/dev/disk/by-uuid/{{ disk_uuid }}"
 		loopback loop (${root})/${isofile}
 		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_dev=${imgdevpath} img_loop=${isofile} earlymodules=loop nomodeset
 		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img
@@ -80,8 +77,7 @@ submenu 'System Rescue CD' {
 		insmod loopback
 		search --no-floppy --fs-uuid {{ disk_uuid }} --set=root
 		set isofile='{{ iso_path }}'
-		probe -u ${root} --set=imgdevuuid
-		set imgdevpath="/dev/disk/by-uuid/${imgdevuuid}"
+		set imgdevpath="/dev/disk/by-uuid/{{ disk_uuid }}"
 		loopback loop (${root})/${isofile}
 		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_dev=${imgdevpath} img_loop=${isofile} earlymodules=loop findroot
 		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img
@@ -96,8 +92,7 @@ submenu 'System Rescue CD' {
 		insmod loopback
 		search --no-floppy --fs-uuid {{ disk_uuid }} --set=root
 		set isofile='{{ iso_path }}'
-		probe -u ${root} --set=imgdevuuid
-		set imgdevpath="/dev/disk/by-uuid/${imgdevuuid}"
+		set imgdevpath="/dev/disk/by-uuid/{{ disk_uuid }}"
 		loopback loop (${root})/${isofile}
 		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_dev=${imgdevpath} img_loop=${isofile} earlymodules=loop break
 		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img