feat: allow chroot into existing rootfs

Signed-off-by: ZHANG Yuntian <yt@radxa.com>

Author: RadxaYuntian

src/libexec/rsdk/rsdk-chroot

@@ -63,7 +63,7 @@ main() {
 		disk="${disk%p*}p"
 	fi
 
-	if [[ ! -b $disk ]] && [[ $disk != /dev/mapper/loop* ]]; then
+	if [[ ! -d $disk ]] && [[ ! -b $disk ]] && [[ $disk != /dev/mapper/loop* ]]; then
 		error "$EXIT_NOT_BLOCK_DEVICE" "$disk"
 	fi
 
@@ -91,6 +91,9 @@ main() {
 	elif [[ -b "$disk"1 ]]; then
 		# old armbian image
 		sudo mount "$disk"1 "$RSDK_TEMP"
+	elif [[ -d $disk ]]; then
+		# actually a rootfs directory
+		sudo mount --bind "$disk" "$RSDK_TEMP"
 	else
 		error "$EXIT_BLKDEV_NO_ROOTDEV" "$disk"
 	fi

src/libexec/rsdk/rsdk-help

@@ -89,12 +89,13 @@ Requires `systemd-nspawn` (provided by `systemd-container` package in Debian).
 
 ## Supported target type
 
-* Raw block devices (i.e. ordinary disks)
+* Raw block device (i.e. ordinary disk)
 * System image file
   * Requires `kpartx` (provided by `multipath-tools` package in Debian)
+* Existing rootfs directory
 
 Following distributions may be used in addition to `rsdk` image:
-* `debox-radxa` image
+* `debos-radxa` image
 * `rbuild` image
 * `rsdk` image
 * `Armbian` image

src/share/bash-completion/completions/rsdk

@@ -61,11 +61,12 @@ _rsdk_chroot_completions() {
 	case "$COMP_CWORD" in
 	2)
 		local i suggestions=()
-		for i in out/*/output.img \
-			"${COMP_WORDS[COMP_CWORD]%/}"/out/*/output.img \
-			"${COMP_WORDS[COMP_CWORD]%/}"/*/output.img \
-			"${COMP_WORDS[COMP_CWORD]%/}"/output.img; do
-			if [[ -f $i ]]; then
+		for i in \
+			out/*/{output.img,rootfs/} \
+			"${COMP_WORDS[COMP_CWORD]%/}"/out/*/{output.img,rootfs/} \
+			"${COMP_WORDS[COMP_CWORD]%/}"/*/{output.img,rootfs/} \
+			"${COMP_WORDS[COMP_CWORD]%/}"/{output.img,rootfs/}; do
+			if [[ -f "$i" ]] || [[ -d "$i" ]]; then
 				suggestions+=("$i")
 			fi
 		done