Fixed location in yamls of sed in fstab & used uuid in Cubietruck Plus bullseye

Author: Jérôme Maurin

cubietruck-plus_bullseye_armhf_vmdb2-0.14.1.yaml

@@ -31,11 +31,6 @@ steps:
     - non-free
     unless: rootfs_unpacked
 
-  - chroot: root
-    shell: |
-      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
-    unless: rootfs_unpacked
-
   - apt: install
     packages:
       - linux-image-armmp-lpae
@@ -55,16 +50,17 @@ steps:
     contents: |+
       CubietruckPlus
 
-#  - fstab: root
+  - fstab: root
 
   - create-file: /etc/flash-kernel/machine
     contents: |+
       Cubietech Cubietruck Plus
 
   - chroot: root
     shell: |
-      echo "/dev/mmcblk0p1 / ext4 noatime,nodiratime,errors=remount-ro 0 1" > /etc/fstab
-      sed -i "s_quiet_root=/dev/mmcblk0p1 net.ifnames=0_g" /etc/default/flash-kernel
+      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
+
+      sed -i "s_quiet_root=$(grep ^UUID /etc/fstab | cut -d \  -f 1) net.ifnames=0_g" /etc/default/flash-kernel
       update-initramfs -u
       rm /etc/flash-kernel/machine
 

cubietruck-plus_buster_armhf_vmdb2-0.14.1.yaml

@@ -31,11 +31,6 @@ steps:
     - non-free
     unless: rootfs_unpacked
 
-  - chroot: root
-    shell: |
-      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
-    unless: rootfs_unpacked
-
   - apt: install
     packages:
       - linux-image-armmp-lpae
@@ -63,6 +58,8 @@ steps:
 
   - chroot: root
     shell: |
+      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
+
       sed -i "s_quiet_root=$(grep ^UUID /etc/fstab | cut -d \  -f 1) net.ifnames=0_g" /etc/default/flash-kernel
       update-initramfs -u
       rm /etc/flash-kernel/machine

cubietruck_buster_armhf_vmdb2-0.14.1.yaml

@@ -31,11 +31,6 @@ steps:
     - non-free
     unless: rootfs_unpacked
 
-  - chroot: root
-    shell: |
-      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
-    unless: rootfs_unpacked
-
   - apt: install
     packages:
       - linux-image-armmp-lpae
@@ -63,6 +58,8 @@ steps:
 
   - chroot: root
     shell: |
+      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
+
       sed -i "s_quiet_root=$(grep ^UUID /etc/fstab | cut -d \  -f 1) net.ifnames=0_g" /etc/default/flash-kernel
       update-initramfs -u
       rm /etc/flash-kernel/machine

rock64_buster_arm64_vmdb2-0.14.1.yaml

@@ -31,11 +31,6 @@ steps:
     - non-free
     unless: rootfs_unpacked
 
-  - chroot: root
-    shell: |
-      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
-    unless: rootfs_unpacked
-
   - apt: install
     packages:
       - linux-image-arm64
@@ -63,6 +58,8 @@ steps:
 
   - chroot: root
     shell: |
+      sed -i s_errors=remount-ro_noatime,nodiratime,errors=remount-ro_g /etc/fstab
+
       sed -i "s_quiet_root=$(grep ^UUID /etc/fstab | cut -d \  -f 1) net.ifnames=0_g" /etc/default/flash-kernel
       update-initramfs -u
       rm /etc/flash-kernel/machine