Fixed --one-file-system handling when dealing with multiple