applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 10:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[grubcfg] fix inter-module dependency with plymouthcfg modules

Browse source 
The plymouthcfg Calamares module is optional. Distributions which
  write filesystems with a full plymouth configuration won't even
  want to use it (see plymouthcfg docs).

  However, now grubcfg depends on plymouthcfg to run because
  the globalstorage value to trigger setting  'splash' in grub,
  is set in the plymouthcfg module.

  Just check for plymouth existence separately in the grub module.

  Fixes ea1c8a0e5d
This commit is contained in:
Gabriel Craciunescu 2018-06-11 15:25:26 +02:00 • committed by Adriaan de Groot
parent db7edf719b
commit 0ccca6902b
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/grubcfg/main.py
View file

@ -44,16 +44,21 @@ def modify_grub_default(partitions, root_mount_point, distributor):
dracut_bin = libcalamares.utils.target_env_call(
["sh", "-c", "which dracut"]
)
have_dracut = dracut_bin == 0 # Shell exit value 0 means success
plymouth_bin = libcalamares.utils.target_env_call(
["sh", "-c", "which plymouth"]
)
# Shell exit value 0 means success
have_plymouth = plymouth_bin == 0
have_dracut = dracut_bin == 0
use_splash = ""
swap_uuid = ""
swap_outer_uuid = ""
swap_outer_mappername = None
if libcalamares.globalstorage.contains("hasPlymouth"):
if libcalamares.globalstorage.value("hasPlymouth"):
use_splash = "splash"
if have_plymouth:
use_splash = "splash"
cryptdevice_params = []