From aa50b2fedc999ecb5783ce12d25ed7ae572641ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 2 Nov 2020 04:33:56 +0100
Subject: [PATCH] grub: override GRUB_DEVICE with /dev/mapper/dmroot

Grub scripts are very persistent in trying to use what is currently
mounted as /. Even if currently (TemplateVM) /dev/xvda3 is mounted
directly, all the configuration should use /dev/mapper/dmroot, to work
also in AppVM.
GRUB_DEVICE is used in various places as root device (including
constructing root= parameter in some versions). Force it to
/dev/mapper/dmroot

QubesOS/qubes-issues#6174
---
 boot/grub.qubes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/grub.qubes b/boot/grub.qubes
index 9b90d64..10ee06c 100644
--- a/boot/grub.qubes
+++ b/boot/grub.qubes
@@ -1,5 +1,6 @@
 # make sure to use /dev/mapper/dmroot, not /dev/xvda directly - both have the
 # same fs, including UUID
+GRUB_DEVICE=/dev/mapper/dmroot
 GRUB_DISABLE_LINUX_UUID=true
 GRUB_DISABLE_OS_PROBER=true
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX root=/dev/mapper/dmroot console=tty0 console=hvc0"