From 44105895f809f32515136064314981aaddf4f42a Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Wed, 25 Mar 2015 18:48:29 +0100 Subject: [PATCH] Use 'which' to find plymouth instead of hard coding /usr/bin Debian ships plymouth in /bin instead of /usr/bin, so we should use 'which' to figure out if it's installed. --- src/modules/grubcfg/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 38afe6d5e..085f9eade 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -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: