SUSE installs plymount files in /usr/lib, not /usr/libexec. So check for both when including plymouth support.
Signed-off-by: Hannes Reinecke <[email protected]> --- 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 index 1360924..7ccf9e4 100755 --- 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 -- To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
