From 04dbde873176ab04e6be40845603e027ec5b7012 Mon Sep 17 00:00:00 2001 From: Vadim Vygonets Date: Tue, 1 Jan 2019 19:42:47 +0100 Subject: [PATCH] FL-6104: Add Grub menuentry flags support to boot-update --- python/funtoo/boot/config.py | 2 +- python/funtoo/boot/extensions/grub.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/python/funtoo/boot/config.py b/python/funtoo/boot/config.py index 07c636c..996c75c 100644 --- a/python/funtoo/boot/config.py +++ b/python/funtoo/boot/config.py @@ -219,7 +219,7 @@ def validate(self): "boot": ["path", "generate", "timeout", "default", "bootdev", "terminal", "autopick"], "display": ["gfxmode", "background", "font"], "color": ["normal", "highlight"], - "default": ["scan", "gfxmode", "kernel", "initrd", "params", "type", "xenkernel", "xenparams", "attemptparams"], + "default": ["scan", "gfxmode", "kernel", "initrd", "params", "type", "xenkernel", "xenparams", "attemptparams", "menuflags"], "grub": ["dir", "file", "grub-mkdevicemap", "grub-probe", "font_src"], "grub-legacy": ["dir", "file"], "lilo": ["file", "bin", "gparams"], diff --git a/python/funtoo/boot/extensions/grub.py b/python/funtoo/boot/extensions/grub.py index 4508c5f..bc5a65b 100644 --- a/python/funtoo/boot/extensions/grub.py +++ b/python/funtoo/boot/extensions/grub.py @@ -121,10 +121,11 @@ def generateOtherBootEntry(self, boot_menu: BootLoaderMenu, sect) -> bool: params = self.boot_config["{s}/params".format(s=sect)].split() myroot = self.resolver.GetParam(params, "root=") mychainloader = self.resolver.GetParam(params, "chainloader=") + menuflags = self.boot_config["{s}/menuflags".format(s=sect)] myname = sect # TODO check for valid root entry boot_menu.lines.append("") - boot_menu.lines.append('menuentry "{mn}" {{'.format(mn=myname)) + boot_menu.lines.append('menuentry "{mn}" {mf} {{'.format(mn=myname, mf=menuflags)) if mytype in ["linux16"]: k = self.resolver.strip_mount_point(self.boot_config[sect + "/kernel"]) full_k = os.path.join(self.boot_config["boot/path"], k.lstrip("/")) @@ -159,7 +160,8 @@ def generateBootEntry(self, boot_menu: BootLoaderMenu, sect: str, k_full_path: s mytype = self.boot_config["{s}/type".format(s=sect)] boot_menu.lines.append("") label = self.resolver.GetBootEntryString(sect, k_full_path) - boot_menu.lines.append('menuentry "{l}" {{'.format(l=label)) + menuflags = self.boot_config["{s}/menuflags".format(s=sect)] + boot_menu.lines.append('menuentry "{l}" {mf} {{'.format(l=label, mf=menuflags)) # TODO: add last-selected, which is different than last-booted. # if self.config["boot/autopick"] == "last-booted":