From 2b9d49f9609ea72f3f353588d6ec324ccae5be36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 13 Jun 2017 01:36:12 +0200 Subject: [PATCH] Update grub configuration This configuration isn't included twice - it's Debian post-installation script of grub that copy settings to /etc/default/grub, which results in parameters being duplicated. Leave it as is for now. Add GRUB_TIMEOUT=0 for faster VM startup. QubesOS/qubes-issues#2577 --- misc/grub.qubes | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/misc/grub.qubes b/misc/grub.qubes index 5621b44..9309ecc 100644 --- a/misc/grub.qubes +++ b/misc/grub.qubes @@ -2,11 +2,8 @@ # same fs, including UUID GRUB_DISABLE_LINUX_UUID=true GRUB_DISABLE_OS_PROBER=true -# don't append twice -if [ -z "$QUBES_APPENDED" ]; then - GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX root=/dev/mapper/dmroot console=hvc0" - # make SWIOTLB smaller - it isn't really needed unless PCI passthrough is used, - # and even then, 16MB is enough - GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX swiotlb=8192" - QUBES_APPENDED=1 -fi +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX root=/dev/mapper/dmroot console=hvc0" +# make SWIOTLB smaller - it isn't really needed unless PCI passthrough is used, +# and even then, 16MB is enough +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX swiotlb=8192" +GRUB_TIMEOUT=0