[packages/dracut/DRACUT-023] - fix path to resume binary - rel 7

baggins baggins at pld-linux.org
Wed Mar 20 22:45:58 CET 2013


commit 2b4d937c4f11f1db7748389d852479c7056c3238
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 20 22:45:24 2013 +0100

    - fix path to resume binary
    - rel 7

 arch-libdir.patch | 11 +++++++++++
 dracut.spec       |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/dracut.spec b/dracut.spec
index 508b94f..a90f567 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,7 +2,7 @@ Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
 Version:	023
-Release:	6
+Release:	7
 License:	GPL v2+
 Group:		Base
 Source0:	ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -13,6 +13,7 @@ Patch1:		bash-sh.patch
 Patch2:		plymouth-libexec.patch
 Patch4:		os-release.patch
 Patch5:		plymouth-logo.patch
+Patch6:		arch-libdir.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	dash
 BuildRequires:	docbook-dtd45-xml
@@ -177,8 +178,10 @@ konfiguracji maszyn.
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i -e 's, at lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
+%{__sed} -i -e 's, at lib@,%{_lib},g' modules.d/95resume/module-setup.sh
 find modules.d -name '*.orig' | xargs -r %{__rm}
 
 %build
diff --git a/arch-libdir.patch b/arch-libdir.patch
new file mode 100644
index 0000000..a1c2e1c
--- /dev/null
+++ b/arch-libdir.patch
@@ -0,0 +1,11 @@
+--- dracut-023/modules.d/95resume/module-setup.sh~	2012-08-01 15:30:30.000000000 +0200
++++ dracut-023/modules.d/95resume/module-setup.sh	2013-03-20 22:44:18.001347921 +0100
+@@ -5,7 +5,7 @@
+ install() {
+     local _bin
+     # Optional uswsusp support
+-    for _bin in /usr/sbin/resume /usr/lib/suspend/resume
++    for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume
+     do
+         [[ -x "${_bin}" ]] && {
+             inst "${_bin}" /usr/sbin/resume
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/2b4d937c4f11f1db7748389d852479c7056c3238



More information about the pld-cvs-commit mailing list