From 460c82ed77d8444732f772d6d98e157e768fa74f Mon Sep 17 00:00:00 2001 From: parazyd Date: Fri, 27 Oct 2017 19:57:12 +0200 Subject: [PATCH] support dynamic bootfs partitions in fstab --- extra/generic-root/etc/fstab | 5 +---- lib/helpers | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/extra/generic-root/etc/fstab b/extra/generic-root/etc/fstab index 6d3ef35..9058008 100644 --- a/extra/generic-root/etc/fstab +++ b/extra/generic-root/etc/fstab @@ -1,9 +1,6 @@ ## -## proc -proc /proc proc nodev,noexec,nosuid 0 0 - ## rootfs /dev/mmcblk0p2 / ext4 noatime 0 1 ## bootfs -/dev/mmcblk0p1 /boot vfat defaults 0 0 +/dev/mmcblk0p1 /boot {{{BOOTFS}}} defaults 0 1 diff --git a/lib/helpers b/lib/helpers index d65ab4e..0287b1d 100644 --- a/lib/helpers +++ b/lib/helpers @@ -82,6 +82,8 @@ copy-root-overlay() { notice "copying generic-root" && \ sudo cp -rfv $R/extra/generic-root/* $strapdir + sudo sed -e "s/{{{BOOTFS}}}/$bootfs/" -i "$strapdir/etc/fstab" + [[ -d $R/extra/$device_name ]] && \ notice "copying ${device_name}-root" && \ sudo cp -rfv $R/extra/$device_name/* $strapdir