stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

branding, plymouth: rescue is stage2 too

Browse Source 
I don't think we're gonna like plymouth over rescue image
anytime soon, especially when it hides the moment when shell
pops up somewhere under it without startup-rescue caring to
remove the splash.

So let's put that $(INSTALL2_BRANDING) into proper stage2
flavours only and avoid choking on missing plymouth as well.
This commit is contained in:
Michael Shigorin 2013-12-25 02:28:54 +02:00
parent f044f58775
commit 6d95f8c370
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features.in/branding/install2/lib/50branding.mk
View File

@ -1 +1,2 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(INSTALL2_BRANDING))
IMAGE_PACKAGES_REGEXP += $(call branding, \
$(STAGE2_BRANDING) $(INSTALL2_BRANDING))

3
features.in/branding/live/lib/50branding.mk
View File

@ -1 +1,2 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))
IMAGE_PACKAGES_REGEXP += $(call branding, \
$(THE_BRANDING) $(STAGE2_BRANDING))

1
features.in/branding/stage2/lib/40branding.mk
View File

@ -1 +0,0 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(STAGE2_BRANDING))

3
features.in/plymouth/stage2/image-scripts.d/10-plymouth
View File

@ -6,4 +6,5 @@ if [ -f "$CONFIG" ]; then
grep -q '^Theme=' "$CONFIG" || sed -i 's/#\([T\[]\)/\1/' "$CONFIG"
fi
cp -a /usr/share/plymouth/default-install-duration /var/lib/plymouth/boot-duration
cp -a /usr/share/plymouth/default-install-duration \
/var/lib/plymouth/boot-duration ||: