Results 2 issues of Andy Kitchen

_This is a rebase of the same patch from #22_ This also makes the UUID matching code more robust at the expense of using the external tool `findmnt' This bug...