From 345c7bd965591e5fe999169a99f88062c46bb7cf Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Thu, 9 Jul 2026 18:31:41 +0000
Subject: [PATCH] armbian_rootenc_setup: new _do_copy_system() function

---
 scripts/armbian_rootenc_setup.sh | 34 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/scripts/armbian_rootenc_setup.sh b/scripts/armbian_rootenc_setup.sh
index cac018c..2d10926 100755
--- a/scripts/armbian_rootenc_setup.sh
+++ b/scripts/armbian_rootenc_setup.sh
@@ -937,6 +937,25 @@ create_bootpart_label() {
 	_add_state_file 'bootpart_label_created' 'mount'
 }
 
+_do_copy_system() {
+	mount "/dev/mapper/$ROOTFS_NAME" $TARGET_ROOT
+
+	pu_msg "Copying system to encrypted root partition:"
+	_show_output
+	rsync $RSYNC_VERBOSITY \
+		--archive \
+		--exclude='boot' \
+		--exclude='var/cache/apt/archives' \
+		$SRC_ROOT/* $TARGET_ROOT
+	_hide_output
+	sync
+	(
+		cd $TARGET_ROOT
+		mkdir 'boot'
+	)
+	umount $TARGET_ROOT
+}
+
 copy_system_root() {
 	if [ "$FORCE_REFORMAT_ROOT" ] || ! cryptsetup isLuks "/dev/$ROOT_DEVNAME"; then
 		pu_msg "Formatting encrypted root partition:"
@@ -947,20 +966,7 @@ copy_system_root() {
 	local fstype=$(lsblk --noheadings --list --output=FSTYPE "/dev/mapper/$ROOTFS_NAME")
 	[ "$fstype" == 'ext4' -a "$ROOTENC_REUSE_FS" ] || mkfs.ext4 -F "/dev/mapper/$ROOTFS_NAME"
 
-	[ "$PARTITION_ONLY" ] || {
-		mount "/dev/mapper/$ROOTFS_NAME" $TARGET_ROOT
-
-		pu_msg "Copying system to encrypted root partition:"
-		_show_output
-		rsync $RSYNC_VERBOSITY --archive --exclude='boot' --exclude='var/cache/apt/archives' $SRC_ROOT/* $TARGET_ROOT
-		_hide_output
-		sync
-
-		mkdir -p "$TARGET_ROOT/boot"
-		touch "$TARGET_ROOT/root/.no_rootfs_resize"
-
-		umount $TARGET_ROOT
-	}
+	[ "$PARTITION_ONLY" ] || _do_copy_system
 
 	cryptsetup luksClose $ROOTFS_NAME
 	do_partprobe