branding, plymouth: rescue is stage2 too

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.

branding, plymouth: rescue is stage2 too
6d95f8c3 · Michael Shigorin · f044f587 · 6d95f8c3 · 6d95f8c3 · f044f587
Commit 6d95f8c3 authored Dec 25, 2013 by Michael Shigorin
4 changed files
--- a/features.in/branding/install2/lib/50branding.mk
+++ b/features.in/branding/install2/lib/50branding.mk
-IMAGE_PACKAGES_REGEXP += $(call branding,$(INSTALL2_BRANDING))
+IMAGE_PACKAGES_REGEXP += $(call branding, \
+				$(STAGE2_BRANDING) $(INSTALL2_BRANDING))
--- a/features.in/branding/live/lib/50branding.mk
+++ b/features.in/branding/live/lib/50branding.mk
-IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))
+IMAGE_PACKAGES_REGEXP += $(call branding, \
+				$(THE_BRANDING) $(STAGE2_BRANDING))
--- a/features.in/branding/stage2/lib/40branding.mk
+++ b/features.in/branding/stage2/lib/40branding.mk
-IMAGE_PACKAGES_REGEXP += $(call branding,$(STAGE2_BRANDING))
--- a/features.in/plymouth/stage2/image-scripts.d/10-plymouth
+++ b/features.in/plymouth/stage2/image-scripts.d/10-plymouth
@@ -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 ||: