Following Steffen's advice I've updated the pull request to kiwi inspired by his changes to mksusecd. Thanks!