Fixes #2905 Added -d, fixed disk partition parsing
Fixes #2905 Added support for lvm + -o option