Cleanned up setup-disk patch

apkovl/root/setup-disk.patch

@@ -15,13 +15,13 @@
  	mkfs.$ROOTFS $MKFS_OPTS_ROOT $mkfs_args "$root_dev"
  	mkdir -p "$SYSROOT"
  	mount -t $ROOTFS $root_dev "$SYSROOT" || return 1
-+	# if [ -n "${USE_CRYPT}" ]; then
-+	# 	cryptsetup luksAddKey --key-file "${CRYPT_KEYFILE}" "${root_dev}" "${CRYPT_KEYFILE}"
-+	# fi
++	if [ -n "${USE_CRYPT}" ]; then
++		cryptsetup luksAddKey "${root_dev}" "${CRYPT_KEYFILE}"
++	fi
  	if [ -n "$boot_dev" ]; then
  		# use separate esp partirion with UEFI but without crypt
  		if [ -n "$USE_EFI" ] && [ -z "$USE_CRYPT" ]; then
-@@ -1286,26 +1293,16 @@
+@@ -1286,26 +1293,14 @@
  setup_crypt() {
  	local dev="$1" local dmname="$2"
  	mkdir -p /run/cryptsetup
@@ -47,14 +47,12 @@
 -		echo "" >&2
 -	done
 +	cryptsetup luksFormat --key-file "${CRYPT_KEYFILE}" --batch-mode --type luks2 "$dev" >&2
-+
 +	cryptsetup open --key-file "${CRYPT_KEYFILE}" "$dev" "$dmname" >&2
-+	cryptsetup luksAddKey "/dev/mapper/${dmname}" "${CRYPT_KEYFILE}" >&2
 +
  	echo "/dev/mapper/$dmname"
  	return 0
  }
-@@ -1592,6 +1589,12 @@
+@@ -1592,6 +1587,12 @@
  	arm*|aarch64) : ${BOOTLOADER:=u-boot};;
  esac
 
@@ -67,7 +65,7 @@
  if [ -d "$1" ]; then
  	# install to given mounted root
  	apk add --quiet $(select_bootloader_pkg)
-@@ -1726,4 +1729,3 @@
+@@ -1726,4 +1727,3 @@
  none) exit 0;;
  *) die "Not a valid install mode: $DISK_MODE" ;;
  esac