From 745a36a17dff39aa184e00ec4201fb8d7de8c2c2 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 26 Jan 2013 22:28:45 +0100 Subject: [PATCH] anaconda: fix grub config setup Remove non-xen options, make the right thing default one --- anaconda/pyanaconda/bootloader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py index 00644a7..10f11c1 100644 --- a/anaconda/pyanaconda/bootloader.py +++ b/anaconda/pyanaconda/bootloader.py @@ -1498,9 +1498,11 @@ class GRUB2(GRUB): except (BootLoaderError, OSError, RuntimeError) as e: log.error("bootloader password setup failed: %s" % e) + # disable non-xen entries + os.chmod("%s/etc/grub.d/10_linux" % ROOT_PATH, 0644) + # make sure the default entry is the OS we are installing - entry_title = "%s Linux, with Linux %s" % (productName, - self.default.version) + entry_title = "%s, with Xen hypervisor" % (productName) rc = iutil.execWithRedirect("grub2-set-default", [entry_title], root=ROOT_PATH,