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

[initcpiocfg] update plymouth check

Browse Source
This commit is contained in:
Philip Müller 2019-12-16 08:43:41 +01:00
parent 14aba17cc3
commit fb3240046d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
# === This file is part of Calamares - <https://github.com/calamares> === # === This file is part of Calamares - <https://github.com/calamares> ===
# #
# Copyright 2014, Rohan Garg <rohan@kde.org> # Copyright 2014, Rohan Garg <rohan@kde.org>
# Copyright 2015 - 2018, Philip Müller <philm@manjaro.org> # Copyright 2015 - 2019, Philip Müller <philm@manjaro.org>
# Copyright 2017, Alf Gaida <agaida@sidution.org> # Copyright 2017, Alf Gaida <agaida@sidution.org>
# Copyright 2019, Adriaan de Groot <groot@kde.org> # Copyright 2019, Adriaan de Groot <groot@kde.org>
# #
@ -100,6 +100,11 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
with open(path, "w") as mkinitcpio_file: with open(path, "w") as mkinitcpio_file:
mkinitcpio_file.write("\n".join(mklins) + "\n") mkinitcpio_file.write("\n".join(mklins) + "\n")
def detect_plymouth():
isPlymouth = target_env_call(["sh", "-c", "which plymouth"])
debug("which plymouth exit code: {!s}".format(isPlymouth))
return isPlymouth
def modify_mkinitcpio_conf(partitions, root_mount_point): def modify_mkinitcpio_conf(partitions, root_mount_point):
""" """
@ -121,8 +126,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
unencrypted_separate_boot = False unencrypted_separate_boot = False
# It is important that the plymouth hook comes before any encrypt hook # It is important that the plymouth hook comes before any encrypt hook
plymouth_bin = os.path.join(root_mount_point, "usr/bin/plymouth") if detect_plymouth() == 0:
if os.path.exists(plymouth_bin):
hooks.append("plymouth") hooks.append("plymouth")
for partition in partitions: for partition in partitions: