clean up mount option passing
9 files changed