mirror of
https://github.com/parchlinux/calamares.git
synced 2025-02-25 03:15:44 -05:00
Fixed initcpiocfg
This commit is contained in:
parent
7d6a04d3a8
commit
bf7f5c6032
1 changed files with 4 additions and 4 deletions
|
@ -162,10 +162,10 @@ def find_initcpio_features(partitions, root_mount_point):
|
||||||
]
|
]
|
||||||
uses_systemd = detect_systemd()
|
uses_systemd = detect_systemd()
|
||||||
|
|
||||||
if uses_systemd:
|
if uses_systemd:
|
||||||
hooks.insert(0, "systemd")
|
hooks.insert(0, "systemd")
|
||||||
hooks.append("sd-vconsole")
|
hooks.append("sd-vconsole")
|
||||||
else:
|
else:
|
||||||
hooks.insert(0, "udev")
|
hooks.insert(0, "udev")
|
||||||
hooks.insert(0, "base")
|
hooks.insert(0, "base")
|
||||||
hooks.append("keymap")
|
hooks.append("keymap")
|
||||||
|
@ -250,7 +250,7 @@ def find_initcpio_features(partitions, root_mount_point):
|
||||||
else:
|
else:
|
||||||
hooks.append("fsck")
|
hooks.append("fsck")
|
||||||
|
|
||||||
return (hooks, modules, files)
|
return (hooks, modules, files, binaries)
|
||||||
|
|
||||||
|
|
||||||
def run():
|
def run():
|
||||||
|
@ -271,7 +271,7 @@ def run():
|
||||||
return (_("Configuration Error"),
|
return (_("Configuration Error"),
|
||||||
_("No root mount point for <pre>initcpiocfg</pre>."))
|
_("No root mount point for <pre>initcpiocfg</pre>."))
|
||||||
|
|
||||||
hooks, modules, files = find_initcpio_features(partitions, root_mount_point)
|
hooks, modules, files, binaries = find_initcpio_features(partitions, root_mount_point)
|
||||||
write_mkinitcpio_lines(hooks, modules, files, binaries, root_mount_point)
|
write_mkinitcpio_lines(hooks, modules, files, binaries, root_mount_point)
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
Loading…
Add table
Reference in a new issue