|
 |
18b4655 |
From a9703fb6e3112bbf63ae0f1b0d4d1b5c55befd32 Mon Sep 17 00:00:00 2001
|
|
|
18b4655 |
From: Will Woods <wwoods@redhat.com>
|
|
|
18b4655 |
Date: Thu, 29 Nov 2012 10:25:03 -0500
|
|
|
18b4655 |
Subject: [PATCH] populate-initrd: If PLYMOUTH_THEME_NAME is set, write it
|
|
|
18b4655 |
into plymouthd.conf
|
|
|
18b4655 |
|
|
|
18b4655 |
You can set PLYMOUTH_THEME_NAME when building initramfs to get a
|
|
|
18b4655 |
different theme into initramfs, but this doesn't change the default
|
|
|
18b4655 |
theme, so the resulting initramfs won't actually use the theme we
|
|
|
18b4655 |
installed.
|
|
|
18b4655 |
|
|
|
18b4655 |
This patch makes plymouth-populate-initrd rewrite the 'Theme=XXX' line
|
|
|
18b4655 |
in plymouthd.conf, so plymouth will use the theme we install.
|
|
|
18b4655 |
---
|
|
|
18b4655 |
scripts/plymouth-populate-initrd.in | 7 +++++++
|
|
|
18b4655 |
1 file changed, 7 insertions(+)
|
|
|
18b4655 |
|
|
|
18b4655 |
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
|
|
|
18b4655 |
index 8d1eec0..d901a9b 100755
|
|
|
18b4655 |
--- a/scripts/plymouth-populate-initrd.in
|
|
|
18b4655 |
+++ b/scripts/plymouth-populate-initrd.in
|
|
|
18b4655 |
@@ -8,6 +8,7 @@
|
|
|
18b4655 |
[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@"
|
|
|
18b4655 |
[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
|
|
|
18b4655 |
[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@PLYMOUTH_LOGO_FILE@"
|
|
|
18b4655 |
+[ -n "$PLYMOUTH_THEME_NAME" ] && THEME_OVERRIDE=1
|
|
|
18b4655 |
[ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
|
|
|
18b4655 |
[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
|
|
|
18b4655 |
[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
|
|
|
18b4655 |
@@ -388,6 +389,12 @@ if [ -z "$PLYMOUTH_THEME_NAME" ]; then
|
|
|
18b4655 |
exit 1
|
|
|
18b4655 |
fi
|
|
|
18b4655 |
|
|
|
18b4655 |
+if [ $THEME_OVERRIDE ]; then
|
|
|
18b4655 |
+ conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf
|
|
|
18b4655 |
+ echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" > /dev/stderr
|
|
|
18b4655 |
+ sed -i "s/^ *Theme *=.*/# theme modified by plymouth-populate-initrd\nTheme=$PLYMOUTH_THEME_NAME/" $conf
|
|
|
18b4655 |
+fi
|
|
|
18b4655 |
+
|
|
|
18b4655 |
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
|
|
|
18b4655 |
|
|
|
18b4655 |
if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
|
|
|
18b4655 |
--
|
|
|
18b4655 |
1.7.11.7
|
|
|
18b4655 |
|