summaryrefslogtreecommitdiff
path: root/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-21 16:16:07 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-21 16:16:07 +0100
commit21a4700d4251a9f63eb3f9cff68885c9544064f0 (patch)
tree956a2a3dc31facebb6f4483f4cc5274c61ba605b /app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch
parent994096b47979765979744b87676c4aa3afd11a56 (diff)
app-admin/calamares : version bump
Diffstat (limited to 'app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch')
-rw-r--r--app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch b/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch
deleted file mode 100644
index 04f41a30..00000000
--- a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
---- a/src/modules/grubcfg/main.py 2018-01-02 14:37:36.000000000 +0000
-+++ b/src/modules/grubcfg/main.py 2019-01-26 22:47:25.005850844 +0000
-@@ -44,16 +44,20 @@
- 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_dracut = dracut_bin == 0
-+ have_plymouth = plymouth_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 = []
-