Merge "Change the format command to always take the mount point as an argument."