Marcus Meissner
0f203926a1
- Rename patch:
* From 0211-fix_multipath_check_hostonly.patch
to 0303-fix_multipath_check_hostonly.patch
- Rename patch:
* From 0213-10i18n-keymap-find.patch
to 0213-Fix-wrong-keymap-inclusion.patch
- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
* Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
- 95fcoe: silence lldpad warnings
* Add 0216-95fcoe-silence-lldpad-warnings.patch
- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
* Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
- 40network: allow persistent interface names (bsc#995284)
* Add 0218-40network-allow-persistent-interface-names.patch
- 95fcoe: use interface names instead of MAC addresses
* Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
* Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
- 95fcoe: Add shutdown script (bsc#994860)
* Add 0221-95fcoe-Add-shutdown-script.patch
- 90dm: Fixup shutdown script (bsc#994860)
* Add 0222-90dm-Fixup-shutdown-script.patch
- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
* Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
- 90multipath: Start daemon after udev settle (bsc#986734)
* Add 0304-90multipath-Start-daemon-after-udev-settle.patch
- 90multipath: load dm_multipath module during startup
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
OBS-URL: https://build.opensuse.org/request/show/422869
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=263
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 9a3027a11ea5bac05c474a85da355e4e74793006 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 4 May 2016 13:36:34 +0200
|
|
Subject: [PATCH] 50plymouth: don't use dpkg defaults on SUSE
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.com>
|
|
---
|
|
modules.d/50plymouth/module-setup.sh | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
|
|
index 27dafca..d00f2f1 100755
|
|
--- a/modules.d/50plymouth/module-setup.sh
|
|
+++ b/modules.d/50plymouth/module-setup.sh
|
|
@@ -3,6 +3,8 @@
|
|
# called by dracut
|
|
check() {
|
|
[[ "$mount_needs" ]] && return 1
|
|
+ # Don't include plymouth if plymouth-dracut package not installed
|
|
+ [ -x /usr/lib/plymouth/plymouth-populate-initrd ] || return 1
|
|
require_binaries plymouthd plymouth plymouth-set-default-theme
|
|
}
|
|
|
|
@@ -14,9 +16,10 @@ depends() {
|
|
# called by dracut
|
|
install() {
|
|
PKGLIBDIR="/usr/lib/plymouth"
|
|
- if type -P dpkg-architecture &>/dev/null; then
|
|
- PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
|
|
- fi
|
|
+ # breaks if dpkg is installed on openSUSE
|
|
+ #if type -P dpkg-architecture &>/dev/null; then
|
|
+ # PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
|
|
+ #fi
|
|
[ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth"
|
|
|
|
if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
|
|
--
|
|
2.6.6
|
|
|