This is an alternative to #123. I think it's better because the regular expression is simpler and its purpose is clearer. Passes all the same tests. The only difference is in the "Fix a bug..." commit. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/124