From cc16479341b250db39c79d219b392e1aff4064e7 Mon Sep 17 00:00:00 2001
From: BodgeMaster <>
Date: Wed, 14 Jun 2023 07:14:17 +0200
Subject: [PATCH] install stage 1: change /mnt/container to /container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Give them partitions names while we’re ar it...
---
 install-stage1.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/install-stage1.sh b/install-stage1.sh
index b664c1c..529dd12 100644
--- a/install-stage1.sh
+++ b/install-stage1.sh
@@ -104,9 +104,9 @@ TARGET_PART_EFI="$(lsblk --raw --noheadings --output PATH "/dev/$TARGET_DISK" |
 TARGET_PART_BOOT="$(lsblk --raw --noheadings --output PATH "/dev/$TARGET_DISK" | sed -n '4p')"
 TARGET_PART_BIG="$(lsblk --raw --noheadings --output PATH "/dev/$TARGET_DISK" | sed -n '5p')"
 
-mkfs.vfat -F32 "$TARGET_PART_EFI"
-mkfs.f2fs -f "$TARGET_PART_BOOT"
-mkfs.f2fs -f "$TARGET_PART_BIG"
+mkfs.vfat -F32 -n "EFIBOOT" "$TARGET_PART_EFI"
+mkfs.f2fs -f -l "boot" "$TARGET_PART_BOOT"
+mkfs.f2fs -f -l "container" "$TARGET_PART_BIG"
 
 mkdir -p /mnt/target
 mount -t tmpfs -o size=3g tmpfs /mnt/target
@@ -115,11 +115,11 @@ mkdir /mnt/target/boot
 mount "$TARGET_PART_BOOT" /mnt/target/boot
 mkdir /mnt/target/boot/efi
 mount "$TARGET_PART_EFI" /mnt/target/boot/efi
-mkdir -p /mnt/target/mnt/container
-mount "$TARGET_PART_BIG" /mnt/target/mnt/container
+mkdir /mnt/target/container
+mount "$TARGET_PART_BIG" /mnt/target/container
 mkdir /mnt/target/home
-mkdir /mnt/target/mnt/container/home
-mount --bind /mnt/target/mnt/container/home /mnt/target/home
+mkdir /mnt/target/container/home
+mount --bind /mnt/target/container/home /mnt/target/home
 
 clear
 echo "Storage is now prepared and ready for installation.
@@ -159,12 +159,12 @@ echo "%wheel ALL=(ALL:ALL) ALL" > /mnt/target/etc/sudoers.d/wheel_as_sudo_group.
 echo "# See fstab(5).
 # <device> <mount point> <fstype> <options> <dump> <pass>
 
-# / and /mnt/container are mounted by a script in initramfs
+# / and /container are mounted by a script in initramfs
 # TODO: add script path
 
 UUID=$(blkid --output value --match-tag UUID $TARGET_PART_BOOT) /boot f2fs defaults,nodev,nosuid 0 2
 UUID=$(blkid --output value --match-tag UUID $TARGET_PART_EFI) /boot/efi vfat defaults 0 2
-/mnt/container/home /home none bind 0 0
+/container/home /home none bind 0 0
 " > /mnt/target/etc/fstab