From a7e2eafe2312f76538c6325bc51c92f3eedaa162 Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Wed, 21 Oct 2020 14:07:48 +0200 Subject: [PATCH 1/2] [qemux86-64_config] Update documentation on image generation Changelog: None Signed-off-by: Lluis Campos --- configs/qemux86-64_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/qemux86-64_config b/configs/qemux86-64_config index 7113688..6b0599d 100644 --- a/configs/qemux86-64_config +++ b/configs/qemux86-64_config @@ -2,7 +2,7 @@ # # This has been tested on images generated with the following command: # -# mkosi -d ubuntu -r bionic -t gpt_ext4 -b --checksum --password password -o image.raw +# mkosi -d ubuntu -r bionic -t gpt_ext4 -b --checksum --password password --package=openssh-server,dhcpcd5 -o image.raw # # Converted with the following command: # From 850e40490af23fab9068e51d0b9c835f1b3fdcd8 Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Wed, 21 Oct 2020 14:08:38 +0200 Subject: [PATCH 2/2] [mender-convert-modify] Allow images with no initrd As probe_initrd_in_boot_and_root indicates, this is not always required. Adding the check for the ln not to throw an error. Changelog: None Signed-off-by: Lluis Campos --- mender-convert-modify | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mender-convert-modify b/mender-convert-modify index 9287441..bebec9b 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -143,7 +143,9 @@ initrd_imagetype=initrd EOF run_and_log_cmd "ln -s ${kernel_imagetype} work/rootfs/boot/kernel" - run_and_log_cmd "ln -s ${initrd_imagetype} work/rootfs/boot/initrd" + if [ "${initrd_imagetype}" != "" ]; then + run_and_log_cmd "ln -s ${initrd_imagetype} work/rootfs/boot/initrd" + fi # For partuuid support grub.cfg expects dedicated variables to be added if [ "${MENDER_ENABLE_PARTUUID}" == "y" ]; then