simplify command -v
This commit is contained in:
parent
1edd4a1185
commit
40561d4c82
@ -157,8 +157,8 @@ case "$devmgr" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# TODO handle situations when LUKS on LVM
|
# TODO handle situations when LUKS on LVM
|
||||||
[ "$luks" = 1 ] && [ -x "$(command -v cryptsetup)" ] && unlock_luks
|
[ "$luks" = 1 ] && command -v cryptsetup 2>&1 > /dev/null && unlock_luks
|
||||||
[ "$lvm" = 1 ] && [ -x "$(command -v lvm)" ] && trigger_lvm
|
[ "$lvm" = 1 ] && command -v lvm 2>&1 > /dev/null && trigger_lvm
|
||||||
mnt_rootfs
|
mnt_rootfs
|
||||||
[ "$debug" = 1 ] && panic "dropping to shell"
|
[ "$debug" = 1 ] && panic "dropping to shell"
|
||||||
cleanup
|
cleanup
|
||||||
|
@ -442,8 +442,8 @@ case "$devmgr" in
|
|||||||
*) msg panic "devmgr option broken" ;;
|
*) msg panic "devmgr option broken" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
[ "$lvm" = 1 ] && [ -x "$(command -v lvm)" ] && install_lvm
|
[ "$lvm" = 1 ] && command -v lvm 2>&1 > /dev/null && install_lvm
|
||||||
[ "$luks" = 1 ] && [ -x "$(command -v cryptsetup)" ] && install_luks
|
[ "$luks" = 1 ] && command -v cryptsetup 2>&1 > /dev/null && install_luks
|
||||||
install_files
|
install_files
|
||||||
create_initramfs
|
create_initramfs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user