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

Added setfont check in mkinitcpiocfg

Browse Source
This commit is contained in:
Boria138 2023-08-19 21:00:25 +06:00
parent 9f8b848631
commit 950e9d1d0a
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,11 +39,22 @@ def detect_plymouth():
def detect_systemd():
"""
Checks existence (runnability) of systemd in the target system.
@return True if systemd exists in the target, False otherwise
"""
# Used to only check existence of path /usr/bin/systemd-cat in target
return target_env_call(["sh", "-c", "which systemd-cat"]) == 0
def detect_setfont():
"""
Checks existence (runnability) of setfont in the target system.
@return True if setfont exists in the target, False otherwise
"""
# Used to only check existence of path /usr/bin/setfont in target
return target_env_call(["sh", "-c", "which setfont"]) == 0
class cpuinfo(object):
"""
Object describing the current CPU's characteristics. It may be
@ -161,6 +172,7 @@ def find_initcpio_features(partitions, root_mount_point):
"keyboard",
]
uses_systemd = detect_systemd()
have_setfont = detect_setfont()
if uses_systemd:
hooks.insert(0, "systemd")
@ -175,8 +187,9 @@ def find_initcpio_features(partitions, root_mount_point):
files = []
binaries = []
# Fixes "setfont: KDFONTOP: Function not implemented" error
binaries.append("setfont")
if have_setfont:
# Fixes "setfont: KDFONTOP: Function not implemented" error
binaries.append("setfont")
swap_uuid = ""
uses_btrfs = False