From: Jan Kiszka <[email protected]> This currently requires to set HOST_DISTRO explicitly. Furthermore, the way the root password is set has been changed and the filenames of kernel and initrd artifacts.
Signed-off-by: Jan Kiszka <[email protected]> --- conf/distro/jailhouse-demo.conf | 5 ++++- kas.yml | 2 +- start-qemu.sh | 7 ++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/distro/jailhouse-demo.conf b/conf/distro/jailhouse-demo.conf index 374f98d..6479317 100644 --- a/conf/distro/jailhouse-demo.conf +++ b/conf/distro/jailhouse-demo.conf @@ -11,11 +11,14 @@ require conf/distro/debian-stretch.conf +HOST_DISTRO ?= "debian-stretch" + KERNEL_NAME ?= "jailhouse" WKS_FILE = "${MACHINE}.wks" PREFERRED_VERSION_jailhouse-${KERNEL_NAME} ?= "0.10" +USERS += "root" # 'root' -CFG_ROOT_PW = "oC3wEGl799tZU" +USER_root[password] = "oC3wEGl799tZU" diff --git a/kas.yml b/kas.yml index b41f71f..0c2a7a3 100644 --- a/kas.yml +++ b/kas.yml @@ -21,7 +21,7 @@ repos: isar: url: https://github.com/ilbers/isar - refspec: 207c160fbd745833a3da25525a71106baacf623b + refspec: 59c7dd2b8b3172d53de1c7a39fbd49751193559a layers: meta: diff --git a/start-qemu.sh b/start-qemu.sh index 4c7be1d..34dfd82 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -65,13 +65,10 @@ esac IMAGE_PREFIX="$(dirname $0)/build/tmp/deploy/images/qemu-${DISTRO_ARCH}/demo-image-jailhouse-demo-qemu-${DISTRO_ARCH}" IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4.img) -KERNEL_FILE=$(ls ${IMAGE_PREFIX}.vmlinuz* | tail -1) -INITRD_FILE=$(ls ${IMAGE_PREFIX}.initrd.img* | tail -1) - shift 1 ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ -m 1G -serial mon:stdio -netdev user,id=net \ - -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ - -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" + -kernel ${IMAGE_PREFIX}-vmlinuz -append "${KERNEL_CMDLINE}" \ + -initrd ${IMAGE_PREFIX}-initrd.img ${QEMU_EXTRA_ARGS} "$@" -- 2.16.4 -- 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/8e31430a8a1b54e92fda3e1b1e02aab4878139bd.1562833696.git.jan.kiszka%40siemens.com. For more options, visit https://groups.google.com/d/optout.
