From 1da3d26c5b6033c60a5292bc7753126c991cacc1 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 22 Jul 2021 19:27:48 +0200
Subject: make_bootable_image: Mutable images require UUID in fstab and kernel
 cmdline for raspi

Hence also fix BOOT_FSTYPE on fstab for mutable images (remount ro -> rw).
---
 stage2/01-sys-tweaks/01-run.sh             | 4 ++++
 stage2/01-sys-tweaks/files/fstab-rootfs_rw | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 stage2/01-sys-tweaks/files/fstab-rootfs_rw

(limited to 'stage2')

diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index 7caf1e7..5749f8e 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -2,6 +2,8 @@
 
 if [ "${ROOTFS_RO}" = "1" ] ; then
     install -v -m 644 files/fstab-rootfs_ro "${ROOTFS_DIR}/etc/fstab"
+else
+    install -v -m 644 files/fstab-rootfs_rw "${ROOTFS_DIR}/etc/fstab"
 fi
 install -m 644 files/overlay_mount.service          "${ROOTFS_DIR}/lib/systemd/system/"
 install -m 755 files/overlay_mount	                "${ROOTFS_DIR}/etc/init.d/"
@@ -54,6 +56,8 @@ on_chroot << EOF
         # without having a live mapping in /etc/fstab.
         systemctl disable systemd-remount-fs
         systemctl mask systemd-remount-fs
+    else
+        sed -i "s/vfat/${BOOT_FSTYPE}/g" /etc/fstab
     fi
 
     systemctl disable rsync
diff --git a/stage2/01-sys-tweaks/files/fstab-rootfs_rw b/stage2/01-sys-tweaks/files/fstab-rootfs_rw
new file mode 100644
index 0000000..5a4df6b
--- /dev/null
+++ b/stage2/01-sys-tweaks/files/fstab-rootfs_rw
@@ -0,0 +1,3 @@
+proc            /proc           proc    defaults          0       0
+BOOTDEV  /boot           vfat    defaults          0       2
+ROOTDEV  /               ext4    defaults,noatime,errors=remount-ro  0       0
-- 
cgit v1.2.3