Simplify boot storage

Please tesst both an ill-formed argument ("/dev/not-disk/...") and a well-formed but invalid one(device was unplugged?)  "/dev/disk/by-uuid/ffffffff-ffff-ffff-ffff-ffffffffffff".