From 80f113cc4c24bd05ad6df20a4e4d2f42ca885ace Mon Sep 17 00:00:00 2001
From: m-sz <marcin.szymczak@golem.network>
Date: Mon, 30 Dec 2024 15:55:58 +0100
Subject: [PATCH 1/2] Improve cross-compatibility of used dependencies

Some of the tools used during the image creation process
were executed based on their absolute path (eg. /sbin),
which might not be the case. Changed them to just use
the executable's name.

Changed scripts shebang to use the more generic
`#!/usr/bin/env bash` to accomodate different OSes.
---
 Makefile             |  1 +
 create-live-image.sh | 14 +++++++-------
 get-merged-rootfs.sh |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e56bef0..eb297e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+.PHONY: all clean
 
 LOCAL_DIR ?= $(shell readlink -m $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 WORK_DIR ?= $(LOCAL_DIR)/work
diff --git a/create-live-image.sh b/create-live-image.sh
index 5609692..72d91ba 100755
--- a/create-live-image.sh
+++ b/create-live-image.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -eux -o pipefail
 
@@ -33,7 +33,7 @@ trap "cleanup ${MNTDIR}" 0 1 2 3 6 15
 truncate -s 16G "${IMG}"
 
 # have static UUIDs to make partition table reproducible
-/usr/sbin/sfdisk "$IMG" <<EOF || exit 1
+sfdisk "$IMG" <<EOF || exit 1
 label: gpt
 label-id: f4796a2a-e377-45bd-b539-d6d49e569055
 
@@ -44,7 +44,7 @@ size=10000MiB, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=693244e6-3e07-47b
 type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=9b06e23f-74bb-4c49-b83d-d3b0c0c2bb01, name="Golem storage"
 EOF
 
-IMG_LOOP=$(/sbin/losetup -P -f --show "$IMG")
+IMG_LOOP=$(losetup -P -f --show "$IMG")
 EFI_IMG_DEV=${IMG_LOOP}p1
 BIOS_IMG_DEV=${IMG_LOOP}p2
 CONF_DEV=${IMG_LOOP}p3
@@ -54,10 +54,10 @@ STORAGE_DEV=${IMG_LOOP}p5
 udevadm settle --exit-if-exists="$IMG_DEV"
 
 # Creating filesystems
-/sbin/mkfs.vfat "${EFI_IMG_DEV}"
-/sbin/mkfs.fat -F32 "${CONF_DEV}"
-/sbin/mkfs.ext4 -U 90a495f3-c8ce-45c6-97ac-3bd5edf3aebd -q -F "${IMG_DEV}"
-/sbin/mkfs.ext4 -q -F "${STORAGE_DEV}"
+mkfs.vfat "${EFI_IMG_DEV}"
+mkfs.fat -F32 "${CONF_DEV}"
+mkfs.ext4 -U 90a495f3-c8ce-45c6-97ac-3bd5edf3aebd -q -F "${IMG_DEV}"
+mkfs.ext4 -q -F "${STORAGE_DEV}"
 
 mkdir -p "${MNTDIR}"
 mount "${IMG_DEV}" "${MNTDIR}"
diff --git a/get-merged-rootfs.sh b/get-merged-rootfs.sh
index f7b0173..35981a2 100755
--- a/get-merged-rootfs.sh
+++ b/get-merged-rootfs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Command-line tool that simplifies the process of extracting Docker images
 # and their root filesystem layers. It saves provided image to a tarball and then

From 2f9a587bac282e70c5dff9220128ecf7e966ea73 Mon Sep 17 00:00:00 2001
From: Marcin Szymczak <mail@marszy.com>
Date: Mon, 3 Feb 2025 10:17:52 +0100
Subject: [PATCH 2/2] Fix the ordering of grub-install

Puts grub-install of the create-live-image.sh script
before the system partitions are unmounted.
Previously, the installation step happened when the work/mnt
directory had the config partition mounted, instead of the root filesystem.

Adds --root-directory flag to grub-install, making GRUB
scan only the loopback device's partition. Previously, with
this option missing, host system was scanned and the LiveUSB
would not work if built on one system and booted on a different one.

Both of those changes make it possible to actually boot the image,
tested using QEMU.
---
 create-live-image.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/create-live-image.sh b/create-live-image.sh
index 72d91ba..d270b4f 100755
--- a/create-live-image.sh
+++ b/create-live-image.sh
@@ -94,6 +94,13 @@ cp "${WORKDIR}/rootfs/usr/lib/shim/shimx64.efi.signed.latest" \
 mkdir -p "${MNTDIR}/.disk"
 echo "Golem Live USB" > "${MNTDIR}/.disk/info"
 
+# Generate BIOS bootable GRUB image
+grub-install \
+    --target=i386-pc \
+    --root-directory="${MNTDIR}" \
+    --modules="part_gpt part_msdos fat iso9660" \
+    "${IMG_LOOP}"
+
 # Umount root filesystem
 umount "${MNTDIR}/boot/efi"
 umount "${MNTDIR}"
@@ -106,8 +113,3 @@ cat > "${MNTDIR}/golemwz-example.toml" << EOF
 #glm_per_hour = "0.25"
 EOF
 
-# Generate BIOS bootable GRUB image
-grub-install \
-    --target=i386-pc \
-    --modules="part_gpt part_msdos fat iso9660" \
-    "${IMG_LOOP}"