- up to 040

- patches updated
- keyctl patch no longer required

diff --git a/dracut.spec b/dracut.spec
index ccc08701f89f87203b962b2faaed6716912f8a4c..70fdfeea2d8e423ff6e12555659fea58dc955a4f 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       038
-Release:       2
+Version:       040
+Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 4487bd98000cc536c5c3839a2f112831
+# Source0-md5: e961da9566b3c0dd838f737f879cf339
 Source1:       pld.conf
 Patch1:                plymouth-libexec.patch
 Patch2:                os-release.patch
@@ -14,7 +14,6 @@ Patch3:               plymouth-logo.patch
 Patch4:                arch-libdir.patch
 Patch5:                systemd-paths.patch
 Patch6:                prelink-libs.patch
-Patch7:                keyctl-path.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -195,7 +194,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh

diff --git a/keyctl-path.patch b/keyctl-path.patch
deleted file mode 100644 (file)
index f271cec..0000000
--- a/keyctl-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dracut-038/modules.d/03modsign/module-setup.sh~    2014-06-30 12:03:12.000000000 +0200
-+++ dracut-038/modules.d/03modsign/module-setup.sh     2014-10-13 19:59:05.689766678 +0200
-@@ -29,7 +29,7 @@
- # called by dracut
- install() {
-     inst_dir /lib/modules/keys
--    inst_binary /usr/bin/keyctl
-+    inst_binary keyctl
- 
-     inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh"
- 

diff --git a/plymouth-libexec.patch b/plymouth-libexec.patch
index fb35e63672995d934fbb7bbcb118002fefe96216..24c4bf84202bf27a267c68186131370c03443a59 100644 (file)
--- a/plymouth-libexec.patch
+++ b/plymouth-libexec.patch
@@ -1,18 +1,17 @@
---- dracut-027/modules.d/50plymouth/module-setup.sh.wiget      2013-03-27 22:56:48.855517817 +0100
-+++ dracut-027/modules.d/50plymouth/module-setup.sh    2013-03-27 22:59:42.251657247 +0100
-@@ -12,12 +12,12 @@ depends() {
- }
+diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/modules.d/50plymouth/module-setup.sh
+--- dracut-040.orig/modules.d/50plymouth/module-setup.sh       2014-10-24 17:41:12.966283303 +0200
++++ dracut-040/modules.d/50plymouth/module-setup.sh    2014-10-24 17:42:58.112954942 +0200
+@@ -13,11 +13,11 @@
  
+ # called by dracut
  install() {
--    if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
--        || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
-+    if grep -q nash /usr/@lib@/plymouth/plymouth-populate-initrd \
-+        || [ ! -x /usr/@lib@/plymouth/plymouth-populate-initrd ]; then
-         . "$moddir"/plymouth-populate-initrd.sh
-     else
-         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
--            /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
-+            /usr/@lib@/plymouth/plymouth-populate-initrd -t "$initdir"
+-    PKGLIBDIR="/usr/lib/plymouth"
++    PKGLIBDIR="/usr/@lib@/plymouth"
+     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"
++    [ -x /usr/@lib@/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/@lib@/plymouth"
  
-     inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
+     if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
+         || [ ! -x ${PKGLIBDIR}/plymouth-populate-initrd ]; then

diff --git a/prelink-libs.patch b/prelink-libs.patch
index 0645766f510130a7d7b0935fbdefecd0771d287c..14b920dfdff7920106acde0dbbaac0facd8a7edf 100644 (file)
--- a/prelink-libs.patch
+++ b/prelink-libs.patch
@@ -1,15 +1,15 @@
 --- dracut-034/dracut.sh.orig  2013-10-20 14:13:51.740264092 +0200
 +++ dracut-034/dracut.sh       2013-10-20 14:29:50.300223867 +0200
 @@ -1266,10 +1266,10 @@
-     if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
-         if [[ $DRACUT_FIPS_MODE ]]; then
-             dinfo "*** Installing prelink files ***"
--            inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
-+            inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
-         else
-             dinfo "*** Pre-linking files ***"
--            inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-+            inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-             chroot "$initdir" "$PRELINK_BIN" -a
-             rm -f -- "$initdir/$PRELINK_BIN"
-             rm -fr -- "$initdir"/etc/prelink.*
+ if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
+     if [[ $DRACUT_FIPS_MODE ]]; then
+         dinfo "*** Installing prelink files ***"
+-        inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
++        inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
+     elif [[ $do_prelink == yes ]]; then
+         dinfo "*** Pre-linking files ***"
+-        inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
++        inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
+         chroot "$initdir" "$PRELINK_BIN" -a
+         rm -f -- "$initdir/$PRELINK_BIN"
+         rm -fr -- "$initdir"/etc/prelink.*