From c59ac324f704c05e6456f8fea66922fd3d1b1115 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Fri, 1 Oct 2021 15:20:35 +0200 Subject: [PATCH] rockchip.wks: use uuid for /boot during fstab-update Since the recent patch to switch to UUIDs [0aa5e600: "use uuid instead of hard-coding root device"] wic fstab-update is not able to get the correct value for the used device anymore and falls to the default 'sda'. Thus wrong /dev/sda entries are generated in fstab. For partitions that should be updated automatically this can be avoided by either generate entries using uuid or label. [NOTE: I rearranged the order of the arguments so they line up] Signed-off-by: MarkusVolk --- wic/rockchip.wks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wic/rockchip.wks b/wic/rockchip.wks index 5ee276b..1cc30ae 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -20,7 +20,7 @@ part reserved1 --offset 4032 --fixed-size 64K part reserved2 --offset 4096 --fixed-size 4096K part loader2 --offset 8192 --fixed-size 4096K --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" part atf --offset 12288 --fixed-size 4096K -part /boot --offset 16384 --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot" +part /boot --offset 16384 --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --use-uuid --sourceparams="loader=u-boot" part / --source rootfs --fstype=ext4 --label root --use-uuid bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw rootfstype=ext4 init=/sbin/init"