[PATCH] installer: improve root device detection and skip additional devices

[PATCH] installer: improve root device detection and skip additional devices

['Badrikesh Prusty' via isar-users]

Strip trailing digits correctly to determine the base device name for
p-style partitioned devices such as mmcblk0p2 and nvme0n1p3. Handle
these devices by removing the p<partition> suffix while preserving
behavior for traditional devices like sda1.

Skip device-mapper (dm-*) and zram (zram*) devices to prevent
presenting virtual or non-installable devices as installation targets.

Signed-off-by: Badrikesh Prusty <badrikesh.prusty@siemens.com>
---
 .../deploy-image/files/usr/bin/deploy-image-wic.sh   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
index ca586aa6..9c041a50 100755
--- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
+++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
@@ -64,7 +64,11 @@ if ! $installer_unattended; then
         # Always exclude the exact device mounted as /
         exclude_list+=("$current_root_dev")
 
-        base_no_part=${current_root_dev%%[0-9]*}
+        if [[ "$current_root_dev" =~ ^(mmcblk|nvme) ]]; then
+            base_no_part="${current_root_dev%p[0-9]*}"
+        else
+            base_no_part="${current_root_dev%%[0-9]*}"
+        fi
         if [ -n "$base_no_part" ]; then
             exclude_list+=("$base_no_part")
         fi
@@ -121,6 +125,9 @@ if ! $installer_unattended; then
         fi
 
         case $device in
+            dm-*)
+                # skip device-mapper device
+                ;;
             loop*)
                 # skip loop device
                 ;;
@@ -132,6 +139,9 @@ if ! $installer_unattended; then
             ram*)
                 # skip ram device
                 ;;
+            zram*)
+                # skip zram device
+                ;;
             *)
                 #skip any excluded devices (root and its slaves)
                 skip_device=0
-- 
2.39.5

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260212202449.1274384-1-badrikesh.prusty%40siemens.com.

Re: [PATCH] installer: improve root device detection and skip additional devices

[Zhihang Wei]

Applied to next, thanks.

Zhihang

On 2/12/26 21:24, 'Badrikesh Prusty' via isar-users wrote:
> Strip trailing digits correctly to determine the base device name for
> p-style partitioned devices such as mmcblk0p2 and nvme0n1p3. Handle
> these devices by removing the p<partition> suffix while preserving
> behavior for traditional devices like sda1.
>
> Skip device-mapper (dm-*) and zram (zram*) devices to prevent
> presenting virtual or non-installable devices as installation targets.
>
> Signed-off-by: Badrikesh Prusty <badrikesh.prusty@siemens.com>
> ---
>   .../deploy-image/files/usr/bin/deploy-image-wic.sh   | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
> index ca586aa6..9c041a50 100755
> --- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
> +++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
> @@ -64,7 +64,11 @@ if ! $installer_unattended; then
>           # Always exclude the exact device mounted as /
>           exclude_list+=("$current_root_dev")
>   
> -        base_no_part=${current_root_dev%%[0-9]*}
> +        if [[ "$current_root_dev" =~ ^(mmcblk|nvme) ]]; then
> +            base_no_part="${current_root_dev%p[0-9]*}"
> +        else
> +            base_no_part="${current_root_dev%%[0-9]*}"
> +        fi
>           if [ -n "$base_no_part" ]; then
>               exclude_list+=("$base_no_part")
>           fi
> @@ -121,6 +125,9 @@ if ! $installer_unattended; then
>           fi
>   
>           case $device in
> +            dm-*)
> +                # skip device-mapper device
> +                ;;
>               loop*)
>                   # skip loop device
>                   ;;
> @@ -132,6 +139,9 @@ if ! $installer_unattended; then
>               ram*)
>                   # skip ram device
>                   ;;
> +            zram*)
> +                # skip zram device
> +                ;;
>               *)
>                   #skip any excluded devices (root and its slaves)
>                   skip_device=0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/0d6ffb28-ee46-4ad5-9f88-fd4d97677ed3%40ilbers.de.