Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2015-09-03 18:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2015-08-25 07:17:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2015-09-03 18:06:51.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 23 19:14:15 UTC 2015 - [email protected] + +- fix plymouth installation if dpkg package is installed + - add dracut_dont_use_dpkg_defaults_on_SUSE.patch + +------------------------------------------------------------------- New: ---- dracut_dont_use_dpkg_defaults_on_SUSE.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.2VcQSW/_old 2015-09-03 18:06:56.000000000 +0200 +++ /var/tmp/diff_new_pack.2VcQSW/_new 2015-09-03 18:06:56.000000000 +0200 @@ -113,6 +113,9 @@ 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 @@ %patch201 -p1 %patch202 -p1 +%patch300 -p1 + %build %configure\ --systemdsystemunitdir=%{_unitdir}\ ++++++ dracut_dont_use_dpkg_defaults_on_SUSE.patch ++++++ 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 \
