hwinfo: re-added disks, little bit of refactoring