From 42905a7b5a25105a7a2be2dd5a90728420d0c737 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Thu, 17 Sep 2015 12:10:26 +0300 Subject: [PATCH] live.mk, regular.mk: move plymouth to test mediacheck It was observed in regular-gnustep-20150916-*.iso that mediacheck boot target sort of starts plymouth bootsplash when not intended to; let's plug this by moving +plymouth away to a test image *but* there are couple things with it: 1) supporting plymouth in mediacheck *might* be a good thing for distros proper -- this will likely require some support on bootsplash theme side either; 2) it's not enough to just drop @bootargs@ from syslinux.cfg snippet as the extra payload will still go in to no avail. --- conf.d/regular.mk | 2 +- conf.d/test.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 18f0503b..2ccaf549 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -105,7 +105,7 @@ distro/regular-wmaker: distro/.regular-sysv \ # gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \ - use/browser/firefox/classic +plymouth + use/browser/firefox/classic @$(call add,THE_BRANDING,graphics) distro/regular-gnustep: distro/.regular-sysv \ diff --git a/conf.d/test.mk b/conf.d/test.mk index efc506f1..1d24c63c 100644 --- a/conf.d/test.mk +++ b/conf.d/test.mk @@ -8,7 +8,7 @@ distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @: distro/live-systemd: distro/.base use/live/base +systemd; @: distro/live-plymouth: distro/.live-base use/plymouth/live; @: -distro/live-mediacheck: distro/.base use/mediacheck; @: +distro/live-mediacheck: distro/.base use/mediacheck +plymouth; @: distro/live-testserver: distro/live-install use/server/mini @$(call set,KFLAVOURS,std-def el-smp)