qubes-installer-qubes-os/anaconda/0006-anaconda-fix-grub-config-setup-by-removing-non-xen-o.patch

31 lines
1.1 KiB
Diff
Raw Normal View History

2018-10-19 06:14:46 +00:00
From 383217cc20f6da8030e98891e34cccd7b03d40c0 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Fri, 19 Oct 2018 08:02:11 +0200
Subject: [PATCH] anaconda: fix grub config setup by removing non-xen options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Frédéric Pierret <frederic.epitre@orange.fr>
---
pyanaconda/bootloader.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index a37f91b9a..68fca98bf 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1558,6 +1558,9 @@ class GRUB2(GRUB):
except (BootLoaderError, OSError, RuntimeError) as e:
log.error("boot loader password setup failed: %s", e)
+ # disable non-xen entries
+ os.chmod("%s/etc/grub.d/10_linux" % iutil.getSysroot(), 0o644)
+
# make sure the default entry is the OS we are installing
if self.default is not None:
# find the index of the default image
--
2.14.4