Browse Source
Merge pull request #243 from lluiscampos/fix-new-qemu-image
[mender-convert-modify] Allow images with no initrd
2.3.x
Lluis Campos
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
2 deletions
-
configs/qemux86-64_config
-
mender-convert-modify
|
|
@ -2,7 +2,7 @@ |
|
|
# |
|
|
# |
|
|
# This has been tested on images generated with the following command: |
|
|
# 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: |
|
|
# Converted with the following command: |
|
|
# |
|
|
# |
|
|
|
|
|
@ -143,7 +143,9 @@ initrd_imagetype=initrd |
|
|
EOF |
|
|
EOF |
|
|
|
|
|
|
|
|
run_and_log_cmd "ln -s ${kernel_imagetype} work/rootfs/boot/kernel" |
|
|
run_and_log_cmd "ln -s ${kernel_imagetype} work/rootfs/boot/kernel" |
|
|
|
|
|
if [ "${initrd_imagetype}" != "" ]; then |
|
|
run_and_log_cmd "ln -s ${initrd_imagetype} work/rootfs/boot/initrd" |
|
|
run_and_log_cmd "ln -s ${initrd_imagetype} work/rootfs/boot/initrd" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
# For partuuid support grub.cfg expects dedicated variables to be added |
|
|
# For partuuid support grub.cfg expects dedicated variables to be added |
|
|
if [ "${MENDER_ENABLE_PARTUUID}" == "y" ]; then |
|
|
if [ "${MENDER_ENABLE_PARTUUID}" == "y" ]; then |
|
|
|
