- fix 90crypt, cryptsetup binary is needed by dratut's own generator

- rel 2

diff --git a/cryptsetup.patch b/cryptsetup.patch
new file mode 100644 (file)
index 0000000..9b820cd
--- /dev/null
+++ b/cryptsetup.patch
@@ -0,0 +1,21 @@
+--- dracut-046/modules.d/90crypt/module-setup.sh~      2017-08-11 13:44:06.000000000 +0200
++++ dracut-046/modules.d/90crypt/module-setup.sh       2017-09-06 02:04:41.264111459 +0200
+@@ -4,7 +4,7 @@
+ check() {
+     local _rootdev
+     # if cryptsetup is not installed, then we cannot support encrypted devices.
+-    require_any_binary $systemdutildir/systemd-cryptsetup cryptsetup || return 1
++    require_binaries $systemdutildir/systemd-cryptsetup cryptsetup || return 1
+ 
+     [[ $hostonly ]] || [[ $mount_needs ]] && {
+         for fs in "${host_fs_types[@]}"; do
+@@ -58,8 +58,8 @@
+     fi
+ 
+     inst_hook cmdline 30 "$moddir/parse-crypt.sh"
++    inst_multiple cryptsetup rmdir readlink umount
+     if ! dracut_module_included "systemd"; then
+-        inst_multiple cryptsetup rmdir readlink umount
+         inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
+         inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
+         inst_hook cmdline 10 "$moddir/parse-keydev.sh"

diff --git a/dracut.spec b/dracut.spec
index f21b2311364ee51d87398719812f555542565303..d1397c8611832cff8023032b560f87d65f932929 100644 (file)
--- 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:       046
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -14,6 +14,7 @@ Patch3:               plymouth-logo.patch
 Patch4:                arch-libdir.patch
 Patch5:                systemd-paths.patch
 Patch6:                prelink-libs.patch
+Patch7:                cryptsetup.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -196,6 +197,7 @@ 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