bootloader: consider GRUB_CFG as location for grub config

sys-kernel/installkernel[grub] supports setting GRUB_CFG in the environment to update a grub.cfg in a non-standard location. Specifically this is useful with sys-boot/grub[secureboot] where the built grub efi executable loads the grub.cfg from the same directory it is in. Recognize the same environment variable here so we don't accidentally update the wrong config. Signed-off-by: Andrew Ammerlaan <[email protected]>
projg2 · Oct 26, 2024 · dfd1aa5 · dfd1aa5
1 parent 55aa5e8
commit dfd1aa5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/ecleankernel/bootloader/grub.py b/ecleankernel/bootloader/grub.py
@@ -11,7 +11,7 @@
 class GRUB(LILO):
     name = 'grub'
     kernel_re = r'^\s*(kernel|module)\s*(\([^)]+\))?(?P<path>\S+)'
-    def_path = ('/boot/grub/menu.lst', '/boot/grub/grub.conf')
+    def_path = ('/boot/grub/menu.lst', '/boot/grub/grub.conf',)
 
     def _get_kernels(self,
                      content: str

diff --git a/ecleankernel/bootloader/grub2.py b/ecleankernel/bootloader/grub2.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 import logging
+import os
 import subprocess
 import typing
 
@@ -17,7 +18,7 @@
 class GRUB2(GRUB):
     name = 'grub2'
     kernel_re = r'^\s*linux\s*(\([^)]+\))?(?P<path>\S+)'
-    def_path = ('/boot/grub/grub.cfg', '/boot/grub2/grub.cfg')
+    def_path = (os.getenv("GRUB_CFG"), '/boot/grub/grub.cfg', '/boot/grub2/grub.cfg')
 
     def __init__(self) -> None:
         super().__init__()

diff --git a/ecleankernel/bootloader/lilo.py b/ecleankernel/bootloader/lilo.py
@@ -11,7 +11,7 @@
 class LILO(Bootloader):
     name = 'lilo'
     kernel_re = r'^\s*image\s*=\s*(?P<path>.+)\s*$'
-    def_path: typing.Tuple[str, ...] = ('/etc/lilo.conf',)
+    def_path: typing.Tuple[typing.Union[str, None], ...] = ('/etc/lilo.conf',)
 
     def __init__(self,
                  path: typing.Optional[str] = None
@@ -23,14 +23,15 @@ def __init__(self,
             paths = (paths,)
 
         for p in paths:
-            try:
-                with open(p) as f:
-                    logging.debug(f'{p} found')
-                    self.path = p
-                    self._content = f.read()
-                    break
-            except FileNotFoundError:
-                pass
+            if p:
+                try:
+                    with open(p) as f:
+                        logging.debug(f'{p} found')
+                        self.path = p
+                        self._content = f.read()
+                        break
+                except FileNotFoundError:
+                    pass
         else:
             raise BootloaderNotFound()