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

Merge pull request #212 from shadeslayer/fix_plymouth_finding

Browse Source 
Use which to find plymouth instead of hard coding /usr/bin
This commit is contained in:
Teo Mrnjavac 2015-03-25 21:40:31 +01:00
commit 535441ee49
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/grubcfg/main.py
View File

@ -33,11 +33,11 @@ def modify_grub_default(partitions, root_mount_point, distributor):
default_dir = os.path.join(root_mount_point, "etc/default")
default_grub = os.path.join(default_dir, "grub")
distributor_replace = distributor.replace("'", "'\\''")
plymouth_bin = os.path.join(root_mount_point, "usr/bin/plymouth")
plymouth_bin = libcalamares.utils.chroot_call("sh -c \"which plymouth\"")
use_splash = ""
swap_uuid = ""
if os.path.exists(plymouth_bin):
if plymouth_bin == 0:
use_splash = "splash"
for partition in partitions: