setup-disk: set swap mount point to "none" to avoid creating /swap

Previously, the swap mount point was set to "swap". This works, but
inadvertently creates the directory /swap when booting. According to
fstab(5), the mount point should be set to "none" for swap.

setup-disk.in

@@ -556,7 +556,7 @@ install_mounted_root() {
 	if [ -n "$SWAP_DEVICES" ]; then
 		local swap_dev
 		for swap_dev in $SWAP_DEVICES; do
-			printf "%s\tswap\tswap\tdefaults\t0 0\n" \
+			printf "%s\tnone\tswap\tdefaults\t0 0\n" \
 				"$(uuid_or_device $swap_dev)" \
 				>> "$mnt"/etc/fstab
 		done
@@ -996,7 +996,7 @@ setup_swap_dev() {
 	SWAP_DEVICES=
 	for swap_dev in "$@"; do
 		$MOCK mkswap $swap_dev >/dev/null
-		printf "%s\tswap\t\tswap\tdefaults 0 0\n" \
+		printf "%s\tnone\t\tswap\tdefaults 0 0\n" \
 			"$(uuid_or_device $swap_dev)" >> "${ROOT}etc/fstab"
 		SWAP_DEVICES="$SWAP_DEVICES $swap_dev"
 	done

tests/setup_disk_test

@@ -270,8 +270,8 @@ setup_disk_sys_body() {
 		-o match:"^ext4$"\
 		awk '$2 == "/boot" {print $3}' mnt/etc/fstab
 	atf_check \
-		-o match:"^swap$"\
-		awk '$2 == "swap" {print $3}' mnt/etc/fstab
+		-o inline:"none\n"\
+		awk '$3 == "swap" {print $2}' mnt/etc/fstab
 }
 
 setup_disk_install_mounted_root_nvme_body() {