diff --git a/files/init b/files/init index d81f1d9..21b5b77 100644 --- a/files/init +++ b/files/init @@ -157,8 +157,8 @@ case "$devmgr" in esac # TODO handle situations when LUKS on LVM -[ "$luks" = 1 ] && [ -x "$(command -v cryptsetup)" ] && unlock_luks -[ "$lvm" = 1 ] && [ -x "$(command -v lvm)" ] && trigger_lvm +[ "$luks" = 1 ] && command -v cryptsetup 2>&1 > /dev/null && unlock_luks +[ "$lvm" = 1 ] && command -v lvm 2>&1 > /dev/null && trigger_lvm mnt_rootfs [ "$debug" = 1 ] && panic "dropping to shell" cleanup diff --git a/tinyramfs b/tinyramfs index d6ac523..9be9bee 100755 --- a/tinyramfs +++ b/tinyramfs @@ -442,8 +442,8 @@ case "$devmgr" in *) msg panic "devmgr option broken" ;; esac -[ "$lvm" = 1 ] && [ -x "$(command -v lvm)" ] && install_lvm -[ "$luks" = 1 ] && [ -x "$(command -v cryptsetup)" ] && install_luks +[ "$lvm" = 1 ] && command -v lvm 2>&1 > /dev/null && install_lvm +[ "$luks" = 1 ] && command -v cryptsetup 2>&1 > /dev/null && install_luks install_files create_initramfs