Update fstab and init

Change-Id: I3386bc3c8495eccbf208b548e149cd10b5ccd8d1