Shawn Dunn
7955a4d13a
- Update dracut to 037 * Add --hostonly_cmdline switch * Update --mount syntax * Include modules from /updates directory * Fixes for network setup * Some small fixes - Rediff patches - Include iscsiuio again (bnc#872474) Remove: remove-iscsiuio.patch - Install 59-scsi-sg_utils.rules (bnc#872478) Add: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch - Install 67-kpartx-compat.rules (bnc#872662) Add: 0016-90multipath-add-67-kpartx-compat.rules.patch - Install separate multipath service file (bnc#871610) Add: 0017-90multipath-install-dracut-specific-service-file.patch - Do not fsck and mount from fstab if systemd is used (bnc# Add: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch - Fixup initqueue for remote-fs Add: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch OBS-URL: https://build.opensuse.org/request/show/229484 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=124
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From ab0a60b5a9c7c747400f458ae4a632b2d88fe2e1 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index b818324..86a68fe 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
|
|
|