]>
Commit | Line | Data |
---|---|---|
7839dcce JR |
1 | --- dracut-046/modules.d/90crypt/module-setup.sh~ 2017-08-11 13:44:06.000000000 +0200 |
2 | +++ dracut-046/modules.d/90crypt/module-setup.sh 2017-09-06 02:04:41.264111459 +0200 | |
3 | @@ -4,7 +4,7 @@ | |
4 | check() { | |
d2960646 | 5 | local fs |
7839dcce | 6 | # if cryptsetup is not installed, then we cannot support encrypted devices. |
d2960646 JP |
7 | - require_any_binary "$systemdutildir"/systemd-cryptsetup cryptsetup || return 1 |
8 | + require_binaries "$systemdutildir"/systemd-cryptsetup cryptsetup || return 1 | |
7839dcce JR |
9 | |
10 | [[ $hostonly ]] || [[ $mount_needs ]] && { | |
11 | for fs in "${host_fs_types[@]}"; do | |
12 | @@ -58,8 +58,8 @@ | |
13 | fi | |
14 | ||
15 | inst_hook cmdline 30 "$moddir/parse-crypt.sh" | |
16 | + inst_multiple cryptsetup rmdir readlink umount | |
17 | if ! dracut_module_included "systemd"; then | |
18 | - inst_multiple cryptsetup rmdir readlink umount | |
19 | inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask | |
20 | inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev | |
21 | inst_hook cmdline 10 "$moddir/parse-keydev.sh" |