Accepting request 328140 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/328140
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=76

dracut.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Aug 23 19:14:15 UTC 2015 - seife+obs@b1-systems.com
+
+- fix plymouth installation if dpkg package is installed
+  - add dracut_dont_use_dpkg_defaults_on_SUSE.patch
+
 -------------------------------------------------------------------
 Mon Aug 17 15:41:14 UTC 2015 - trenn@suse.de
 

dracut.spec

@@ -113,6 +113,9 @@ Patch200:       dracut_fix_multipath_without_config.patch
 Patch201:       fix_nfs_with_ip_instead_of_hostname.patch
 Patch202:       dracut_dmraid_use_udev.patch
 
+## fix for SUSE systems which have dpkg installed anyway
+Patch300:       dracut_dont_use_dpkg_defaults_on_SUSE.patch
+
 BuildRequires:  asciidoc
 BuildRequires:  bash
 BuildRequires:  docbook-xsl-stylesheets
@@ -240,6 +243,8 @@ and its cryptography during startup.
 %patch201 -p1
 %patch202 -p1
 
+%patch300 -p1
+
 %build
 %configure\
   --systemdsystemunitdir=%{_unitdir}\

dracut_dont_use_dpkg_defaults_on_SUSE.patch

@@ -0,0 +1,18 @@
+Index: b/modules.d/50plymouth/module-setup.sh
+===================================================================
+--- a/modules.d/50plymouth/module-setup.sh
++++ b/modules.d/50plymouth/module-setup.sh
+@@ -14,9 +14,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 \