Remove ^M
fix typo for mkswap
Change the partition position of the GPT