napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[initcpiocfg] Refactor, improve testability

Browse Source 
- don't chain directly from modify_mkinitcpio_conf() to the
  function that writes the file write_mkinitcpio_lines();
  split into "figure out what needs to be written" and calling
  that writing-function, so that we can test / check / log
  if needed between the two.
This commit is contained in:
Adriaan de Groot 2021-09-21 13:13:21 +02:00
parent 118e18ac60
commit 60e495bd8c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/initcpiocfg/main.py
View File

@ -125,12 +125,16 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
mkinitcpio_file.write("\n".join(mklins) + "\n")
def modify_mkinitcpio_conf(partitions, root_mount_point):
def find_initcpio_features(partitions, root_mount_point):
"""
Modifies mkinitcpio.conf
Returns a tuple (hooks, modules, files) needed to support
the given @p partitions (filesystems types, encryption, etc)
in the target.
:param partitions:
:param root_mount_point:
:param partitions: (from GS)
:param root_mount_point: (from GS)
:return 3-tuple of lists
"""
hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
modules = []
@ -198,7 +202,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
else:
hooks.append("fsck")
write_mkinitcpio_lines(hooks, modules, files, root_mount_point)
return (hooks, modules, files)
def run():
@ -219,6 +223,7 @@ def run():
return (_("Configuration Error"),
_("No root mount point is given for <pre>{!s}</pre> to use." ).format("initcpiocfg"))
modify_mkinitcpio_conf(partitions, root_mount_point)
hooks, modules, files = find_initcpio_features(partitions, root_mount_point)
write_mkinitcpio_lines(hooks, modules, files, root_mount_point)
return None