3f26422f3a
- Rename patches to match git repository:
* old: 0013-Correct-paths-for-openSUSE.patch
new: 0011-Correct-paths-for-openSUSE.patch
* old: 0014-Check-for-plymouth-lib-directories.patch
new: 0012-Check-for-plymouth-lib-directories.patch
* old: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
new: 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch
* old: suse_grub_manpage.patch
new: 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch
* old: replace_dhclient_with_wickedd_dhcp_supplicants.patch
new: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
* old: 0015-add-new-s390x-specific-rule-files.patch
new: 0016-Add-new-s390x-specific-rule-files.patch
* old: change_write_ifcfg_to_suse.patch
new: 0017-45ifcfg-use-distro-specific-scripts.patch
* old: dracut-fix-whitespace-add-drivers_call.patch
new: 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch
* old: wait_for_network_race_condition_fix.patch
new: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
* old: dracut-warpclock_module.patch
new: 0020-00warpclock-Set-correct-timezone.patch
* old: s390-dcssblk.patch
new: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch
* old: dracut-install-persistent-rule.patch
new: 0022-95udev-rules-add-persistent-network-rule.patch
* old: dracut-really-always-add-autofs4.patch
new: 0023-systemd-always-tries-to-load-autofs4.patch
* old: mdraid-setup.patch
new: 0024-Fixup-mdraid-setup.patch
* old: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch
OBS-URL: https://build.opensuse.org/request/show/236221
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=156
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
|
|
|