c0e1df1a13
- Update with patches from git repository:
* kernel-modules: add ohci-pci to the list of forced module installs
* Run 'xz' and 'lzma' with multiple threads
* systemd: do not exit the initqueue, if systemd asks a password
* iscsi,nbd: do not fail in hostonly mode
* dracut-functions.sh: Avoid loading unnecessary 32-bit libraries
for 64-bit initrds
* fips: also install /etc/system-fips in the initramfs
* dracut.modules.7.asc: removed empty section
* dracut.sh: fixed PATH shortener
* dracut.spec: move /sbin/dracut to /usr/sbin/dracut
* iscsi/nbd: do not try to mount the whole disk, if root= is missing
* fips: include crct10dif_generic
* Handle crypto modules with and without modaliases
* usrmount/module-setup.sh: fixed typo
* lvm: always install thin utils for lvm
* kernel-modules(ARM): add mmc_block usb_storage to static list of
kernel mods
* dracut-functions.sh:check_block_and_slaves*() skip LVM internal devs
* mkdir basic dirs in /run
* network/fcoe: only redirect output to loginit.pipe, if exists
* dracut.sh: no need to make subdirs in run
* dracut.sh: also mkdir /run/lock, which is copied to
* lvm: fix thin recognition
* Add lzo, lz4 compression and read INITRD_COMPRESS
* remove resume-genrules.sh
* resume: fix swap detection in hostonly
* base/init.sh: also mkdir /run/lock
* dmsquash-live: add /dev/mapper/live-base
* Doc: cleanup, extend and split and reuse
OBS-URL: https://build.opensuse.org/request/show/208892
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=82
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From cc0ec0cdcef806efe2315931ba4705fb35b82c6a 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 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
|
|
|