From 42bbe02c789acfc60c1b9588a2bd9aaec7cc47f2 Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Thu, 24 Jun 2021 14:32:01 +0200 Subject: [PATCH 1/2] Fix broken imagetool.sh --mount (#529) --- imagetool.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/imagetool.sh b/imagetool.sh index adc1ab7..e8467e1 100755 --- a/imagetool.sh +++ b/imagetool.sh @@ -103,10 +103,12 @@ if [ "${UMOUNT}" = "1" ] && [ -z "${MOUNTPOINT}" ]; then fi export NBD_DEV="${NBD_DEV:-/dev/nbd1}" +export MAP_BOOT_DEV=/dev/mapper/nbd1p1 +export MAP_ROOT_DEV=/dev/mapper/nbd1p2 source scripts/qcow2_handling if [ "${MOUNT}" = "1" ]; then - mount_qimage "${MOUNTPOINT}" "${IMAGE}" + mount_qimage "${IMAGE}" "${MOUNTPOINT}" elif [ "${UMOUNT}" = "1" ]; then umount_qimage "${MOUNTPOINT}" fi From ff1e8b1aac4a6680ff36092121b20def300556f7 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Wed, 1 Sep 2021 12:10:26 +0200 Subject: [PATCH 2/2] Remove deprecated elevator key from cmdline (#535) With recent kernel versions, the "deadline" I/O scheduler has been replaced with "mq-deadline", and the "elevator" kernel command line option has been deprecated in general with Linux 5.4: https://kernelnewbies.org/Linux_5.4?highlight=%28elevator%29#Block_layer Signed-off-by: MichaIng --- stage1/00-boot-files/files/cmdline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1/00-boot-files/files/cmdline.txt b/stage1/00-boot-files/files/cmdline.txt index b815bd8..03cde68 100644 --- a/stage1/00-boot-files/files/cmdline.txt +++ b/stage1/00-boot-files/files/cmdline.txt @@ -1 +1 @@ -console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait +console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait