If you used isinstance instead of d.type you wouldn't need two patches. -- To view this comment on github, visit https://github.com/mulkieran/blivet/commit/c4ed987513750cabd9054651840b78fbc1d28bcb#commitcomment-10940474