From: Jan Kiszka <[email protected]> Since the wic update, the boot partition is actually tried to be mounted. This fails due CONFIG_SYSFS_DEPRECATED - systemd simply does not find the device node.
We also need to move the mount point to avoid overriding the content in /boot. Finally, --use-uuid permits to use it irrespective of the boot medium. Also drop the unused --ondisk parameters at this chance. Signed-off-by: Jan Kiszka <[email protected]> --- recipes-kernel/linux/files/amd64_defconfig_5.10 | 2 -- wic/hikey620.wks | 6 +++--- wic/ipc127e.wks | 4 ++-- wic/nuc6cay.wks | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/recipes-kernel/linux/files/amd64_defconfig_5.10 b/recipes-kernel/linux/files/amd64_defconfig_5.10 index 11bc670..ac6fdc2 100644 --- a/recipes-kernel/linux/files/amd64_defconfig_5.10 +++ b/recipes-kernel/linux/files/amd64_defconfig_5.10 @@ -29,8 +29,6 @@ CONFIG_NAMESPACES=y # CONFIG_PID_NS is not set # CONFIG_NET_NS is not set CONFIG_SCHED_AUTOGROUP=y -CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EXPERT=y diff --git a/wic/hikey620.wks b/wic/hikey620.wks index 9fe9e70..a438bf6 100644 --- a/wic/hikey620.wks +++ b/wic/hikey620.wks @@ -9,8 +9,8 @@ # SPDX-License-Identifier: MIT # -part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 +part /boot/efi --source bootimg-efi-isar --sourceparams "loader=grub-efi" --label efi --part-type EF00 --align 1024 --use-uuid -part / --source rootfs --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid -bootloader --ptable gpt --timeout=3 --append "mem=1820M" +bootloader --ptable gpt --timeout 3 --append "mem=1820M" diff --git a/wic/ipc127e.wks b/wic/ipc127e.wks index 777d446..fbbcb35 100644 --- a/wic/ipc127e.wks +++ b/wic/ipc127e.wks @@ -9,8 +9,8 @@ # SPDX-License-Identifier: MIT # -part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 +part /boot/efi --source bootimg-efi-isar --sourceparams "loader=grub-efi" --label efi --part-type EF00 --align 1024 --use-uuid -part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid bootloader --ptable gpt --timeout 3 --append "intel_iommu=off memmap=82M\$0x3a000000" diff --git a/wic/nuc6cay.wks b/wic/nuc6cay.wks index a8cbff9..94aded8 100644 --- a/wic/nuc6cay.wks +++ b/wic/nuc6cay.wks @@ -9,8 +9,8 @@ # SPDX-License-Identifier: MIT # -part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 +part /boot/efi --source bootimg-efi-isar --sourceparams "loader=grub-efi" --label efi --part-type EF00 --align 1024 --use-uuid -part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid bootloader --ptable gpt --timeout 3 --append "rootwait intel_iommu=off memmap=82M\$0x3a000000" -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/3e097f04612418d2bf91011b06174669e9dfd300.1621593454.git.jan.kiszka%40siemens.com.
