From 13d42ca2d98ba2281a691430f506cd3548c748f2122a3897be591dea083c7ff8 Mon Sep 17 00:00:00 2001
From: Cliff Zhao <qzhao@suse.com>
Date: Fri, 3 Apr 2020 09:24:42 +0000
Subject: [PATCH] Accepting request 791142 from home:qzhao:branches:Base:System

Add plymouth-dracut-path back to resolve the openQA failure.

OBS-URL: https://build.opensuse.org/request/show/791142
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=249
---
 plymouth-dracut-path.patch | 14 ++++++++++++++
 plymouth.changes           |  2 --
 plymouth.spec              | 10 ++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 plymouth-dracut-path.patch

diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch
new file mode 100644
index 0000000..5589ef3
--- /dev/null
+++ b/plymouth-dracut-path.patch
@@ -0,0 +1,14 @@
+diff -Nura plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20191224+d7c737d_new/scripts/plymouth-populate-initrd.in
+--- plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth-populate-initrd.in	2020-04-03 11:27:53.666924816 +0800
++++ plymouth-0.9.5+git20191224+d7c737d_new/scripts/plymouth-populate-initrd.in	2020-04-03 12:19:37.642127397 +0800
+@@ -414,8 +414,8 @@
+ ddebug "Running with PLYMOUTH_LDD_PATH=$PLYMOUTH_LDD_PATH"
+ 
+ mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
+-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
+-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
++inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd
++inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth
+ inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
+ inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
+ inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
diff --git a/plymouth.changes b/plymouth.changes
index 724b2f9..e653076 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -29,8 +29,6 @@ Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao <qzhao@suse.com>
   * drm: Mark buffer as clean in ply_renderer_head_new()
   * throbgress: Remove the throbgress plugin
   * boot-splash: fix memory leak in error path.
-- Drop plymouth-dracut-path.patch:
-  Nolonger needed for the latest update.
 - Drop  plymouth-correct-runtime-dir.patch:
   Nolonger needed for the latest update.
 - Porting old patches to fit the latest update.
diff --git a/plymouth.spec b/plymouth.spec
index cbcb877..a8a44ba 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -32,14 +32,16 @@ Group:          System/Base
 URL:            https://www.freedesktop.org/wiki/Software/Plymouth
 Source0:        %{name}-%{version}.tar.xz
 Source1:        boot-duration
+# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com -- Prefix is /usr/sbin and /usr/bin
+#Patch0:         plymouth-dracut-path.patch
 # PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
-Patch0:         plymouth-some-greenish-openSUSE-colors.patch
+Patch1:         plymouth-some-greenish-openSUSE-colors.patch
 # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de  -- Fix man page installation
-Patch1:         plymouth-manpages.patch
+Patch2:         plymouth-manpages.patch
 # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
-Patch2:         plymouth-only_use_fb_for_cirrus_bochs.patch
+Patch3:         plymouth-only_use_fb_for_cirrus_bochs.patch
 # PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown.
-Patch3:         plymouth-avoid-umount-hanging-shutdown.patch
+Patch4:         plymouth-avoid-umount-hanging-shutdown.patch
 # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
 Patch1000:      0001-Add-label-ft-plugin.patch
 # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.