From 5a24916fd0ad67315c5ff65be030451631be174e Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 26 Mar 2015 15:53:50 +0100 Subject: [PATCH] Make which plymouth execute in chroot. --- src/modules/grubcfg/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 085f9eade..1cf40e721 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -33,10 +33,12 @@ 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 = libcalamares.utils.chroot_call("sh -c \"which plymouth\"") + plymouth_bin = libcalamares.utils.chroot_call(["sh", "-c", "which plymouth"]) use_splash = "" swap_uuid = "" + libcalamares.utils.debug("which plymouth exit code: {!s}".format(plymouth_bin)) + if plymouth_bin == 0: use_splash = "splash"