Your previous branch coerces type=='mbr' to role=mbr so that should be an easy transition. For backward compatibility though, be sure to still handle filesystem_label if role isn't provided.
Your previous branch coerces type=='mbr' to role=mbr so that should be an easy transition. For backward compatibility though, be sure to still handle filesystem_label if role isn't provided.