From b8ceee513f23589711af8bf8de88c4b1b47cb13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 4 Sep 2017 02:25:50 +0200 Subject: [PATCH] anaconda: generate proper extlinux.conf Fixes QubesOS/qubes-issues#2902 --- anaconda/pyanaconda/bootloader.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py index 59be694..d9767cb 100644 --- a/anaconda/pyanaconda/bootloader.py +++ b/anaconda/pyanaconda/bootloader.py @@ -2352,6 +2352,8 @@ class EXTLINUX(BootLoader): def write_config_images(self, config): self.write_config_console(config) + xen_gz = [x for x in os.listdir(iutil.getSysroot() + self.config_dir) if + x.startswith('xen-') and x.endswith('.gz')][0] for image in self.images: args = Arguments() args.update(["root=%s" % image.device.fstab_spec, "ro"]) @@ -2364,10 +2366,12 @@ class EXTLINUX(BootLoader): label = "%s(%s)" % (self.image_label(image), image.version) label = label.replace(" ", "") stanza = ("label %(label)s\n" - "\tkernel %(boot_prefix)s/%(kernel)s\n" - "\tinitrd %(boot_prefix)s/%(initrd)s\n" - "\tappend %(args)s\n\n" + "\tkernel mboot.c32\n" + "\tappend %(boot_prefix)s/%(xen)s --- " + "%(boot_prefix)s/%(kernel)s %(args)s --- " + "%(boot_prefix)s/%(initrd)s\n" % {"label": label, + "xen": xen_gz, "kernel": image.kernel, "initrd": image.initrd, "args": args,