added wait for fs and wait for mountpoint