2014-04-09 12:44:32 +00:00
|
|
|
From ab0a60b5a9c7c747400f458ae4a632b2d88fe2e1 Mon Sep 17 00:00:00 2001
|
2013-11-29 12:27:47 +00:00
|
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
|
|
Date: Wed, 27 Nov 2013 15:54:00 +0100
|
|
|
|
Subject: [PATCH] Check for plymouth lib directories
|
|
|
|
|
|
|
|
SUSE installs plymount files in /usr/lib, not /usr/libexec.
|
|
|
|
So check for both when including plymouth support.
|
|
|
|
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
|
---
|
|
|
|
modules.d/50plymouth/module-setup.sh | 17 ++++++++++++-----
|
|
|
|
1 file changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
|
2014-04-09 12:44:32 +00:00
|
|
|
index b818324..86a68fe 100755
|
2013-11-29 12:27:47 +00:00
|
|
|
--- a/modules.d/50plymouth/module-setup.sh
|
|
|
|
+++ b/modules.d/50plymouth/module-setup.sh
|
|
|
|
@@ -15,12 +15,19 @@ depends() {
|
|
|
|
|
|
|
|
# called by dracut
|
|
|
|
install() {
|
|
|
|
- if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
|
|
|
|
- || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
|
|
|
|
+ if [ -d /usr/libexec/plymouth ] ; then
|
|
|
|
+ _plymouth=/usr/libexec/plymouth;
|
|
|
|
+ elif [ -d /usr/lib/plymouth ] ; then
|
|
|
|
+ _plymouth=/usr/lib/plymouth
|
|
|
|
+ fi
|
|
|
|
+ if [ -n "$_plymouth" ] ; then
|
|
|
|
+ if grep -q nash ${_plymouth}/plymouth-populate-initrd \
|
|
|
|
+ || [ ! -x ${_plymouth}/plymouth-populate-initrd ]; then
|
|
|
|
. "$moddir"/plymouth-populate-initrd.sh
|
|
|
|
- else
|
|
|
|
- PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
|
|
|
|
- /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
|
|
|
|
+ else
|
|
|
|
+ PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
|
|
|
|
+ ${_plymouth}/plymouth-populate-initrd -t "$initdir"
|
|
|
|
+ fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
|
|
|
|
--
|
|
|
|
1.8.1.4
|
|
|
|
|