merged from branch. run fsck before mounts.