diff options
| -rw-r--r-- | app-admin/calamares/calamares-3.1.12-r3.ebuild (renamed from app-admin/calamares/calamares-3.1.12-r2.ebuild) | 2 | ||||
| -rw-r--r-- | app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch | 28 |
2 files changed, 30 insertions, 0 deletions
diff --git a/app-admin/calamares/calamares-3.1.12-r2.ebuild b/app-admin/calamares/calamares-3.1.12-r3.ebuild index 042edc7f..025076b6 100644 --- a/app-admin/calamares/calamares-3.1.12-r2.ebuild +++ b/app-admin/calamares/calamares-3.1.12-r3.ebuild @@ -54,6 +54,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-dont-run-locale-gen.patch # support auto-unlocking encrypted partitions via OpenRC's dmcrypt service epatch -p1 "${FILESDIR}"/${PN}-openrc-dmcrypt-cfg-r1.patch + # fix grubcfg breakage introduced by Manjaro, we don't rely on plymouthcfg to have splash + epatch -p1 "${FILESDIR}"/${PN}-dont-rely-on-plymouthcfg.patch # replace calamares installer desktop icon sed -i "s/Icon=calamares/Icon=start-here/g" "${S}/calamares.desktop" # fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY) diff --git a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch b/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch new file mode 100644 index 00000000..04f41a30 --- /dev/null +++ b/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch @@ -0,0 +1,28 @@ +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 = [] + |