[5/7] qemuarm64-secureboot: set root device correctly

Message ID 20220407160925.3809765-5-ross.burton@arm.com
State New
Headers show
Series [1/7] CI: install pregenerated SSH keys to speed up boot | expand

Commit Message

Ross Burton April 7, 2022, 4:09 p.m. UTC
The default root device is /dev/vda, because typically a bare filesystem
is mounted there.

However, qemuarm64-secureboot uses a disk image with partitions, so this
should be /dev/vda2.  Currently this works because qemuarm64-secureboot
has an extlinux.conf which explicitly sets the root device, but we're
working at removing that.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/conf/machine/qemuarm64-secureboot.conf | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf
index 22fb1d3e..a467b204 100644
--- a/meta-arm/conf/machine/qemuarm64-secureboot.conf
+++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf
@@ -14,6 +14,7 @@  QB_DEFAULT_FSTYPE = "wic.qcow2"
 QB_DEFAULT_BIOS = "flash.bin"
 QB_FSINFO = "wic:no-kernel-in-fs"
 QB_ROOTFS_OPT = ""
+QB_KERNEL_ROOT = "/dev/vda2"
 
 IMAGE_FSTYPES += "wic wic.qcow2"