QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: generate proper extlinux.conf

Browse Source 
Fixes QubesOS/qubes-issues#2902
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-04 02:25:50 +02:00
parent 696bd4ccf3
commit b8ceee513f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
anaconda/pyanaconda/bootloader.py
View File

@ -2352,6 +2352,8 @@ class EXTLINUX(BootLoader):
def write_config_images(self, config): def write_config_images(self, config):
self.write_config_console(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: for image in self.images:
args = Arguments() args = Arguments()
args.update(["root=%s" % image.device.fstab_spec, "ro"]) 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 = "%s(%s)" % (self.image_label(image), image.version)
label = label.replace(" ", "") label = label.replace(" ", "")
stanza = ("label %(label)s\n" stanza = ("label %(label)s\n"
"\tkernel %(boot_prefix)s/%(kernel)s\n" "\tkernel mboot.c32\n"
"\tinitrd %(boot_prefix)s/%(initrd)s\n" "\tappend %(boot_prefix)s/%(xen)s --- "
"\tappend %(args)s\n\n" "%(boot_prefix)s/%(kernel)s %(args)s --- "
"%(boot_prefix)s/%(initrd)s\n"
% {"label": label, % {"label": label,
"xen": xen_gz,
"kernel": image.kernel, "kernel": image.kernel,
"initrd": image.initrd, "initrd": image.initrd,
"args": args, "args": args,