hwinfo: re-added disks, little bit of refactoring

Ok, now that it does not aim to be used outside of metacommand, it's not an issue.