Add option upgrade, change fstab building