Indeed fixes a bug where minors and indices are interchanged on cleanup-- good catch. Factoring out the index conversion is nice. Hopefully no one is adversely affected by the stride change (16->128) and different naming, but they should be using udev + labels/uuids anyways. Reviewed-by: Michael Lyle <mlyle@xxxxxxxx>