public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] isar-installer: add mdadm support and filter out RAID member disks
@ 2025-10-16  3:34 'Kasturi Shekar' via isar-users
  2025-10-24 15:57 ` Zhihang Wei
  0 siblings, 1 reply; 2+ messages in thread
From: 'Kasturi Shekar' via isar-users @ 2025-10-16  3:34 UTC (permalink / raw)
  To: isar-users; +Cc: Kasturi Shekar

The installer now conditionally includes the `mdadm` package,
based on the presence of the `raid` feature in `MACHINE_FEATURES`
Additionally, the device selection dialog is updated to exclude
physical disks that are members of a RAID volume.

Signed-off-by: Kasturi Shekar <kasturi.shekar@siemens.com>
---
 .../images/isar-image-installer.bb             |  2 ++
 .../files/usr/bin/deploy-image-wic.sh          | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/meta-isar/recipes-core/images/isar-image-installer.bb b/meta-isar/recipes-core/images/isar-image-installer.bb
index db379f5d..300591ab 100644
--- a/meta-isar/recipes-core/images/isar-image-installer.bb
+++ b/meta-isar/recipes-core/images/isar-image-installer.bb
@@ -26,3 +26,5 @@ IMAGER_INSTALL:wic:append = " ${SYSTEMD_BOOTLOADER_INSTALL}"
 IMAGE_INSTALL += "deploy-image-service"
 
 IMAGE_INSTALL:remove = "expand-on-first-boot"
+
+IMAGE_PREINSTALL:append = "${@ bb.utils.contains('MACHINE_FEATURES', 'raid', ' mdadm', '', d) }"
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 333762f1..778370b1 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
@@ -60,6 +60,24 @@ if ! $installer_unattended; then
     devices="$devices $mmc_devices"
 
     for device in $devices; do
+        is_raid_member=0
+
+        if [ -d "/sys/block/$device/holders" ] && [ ! -d "/sys/block/$device/md" ]; then
+            for holder_path in /sys/block/$device/holders/*; do
+                holder_name=$(basename "$holder_path")
+                case "$holder_name" in
+                    md[0-9]*)
+                        is_raid_member=1
+                        break
+                        ;;
+                esac
+            done
+        fi
+
+        if [ "$is_raid_member" -eq 1 ]; then
+            continue # Skip RAID member disks
+        fi
+
         case $device in
             loop*)
                 # skip loop device
-- 
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/20251016033421.1172746-1-kasturi.shekar%40siemens.com.

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] isar-installer: add mdadm support and filter out RAID member disks
  2025-10-16  3:34 [PATCH] isar-installer: add mdadm support and filter out RAID member disks 'Kasturi Shekar' via isar-users
@ 2025-10-24 15:57 ` Zhihang Wei
  0 siblings, 0 replies; 2+ messages in thread
From: Zhihang Wei @ 2025-10-24 15:57 UTC (permalink / raw)
  To: Kasturi Shekar, isar-users

Applied to next, thanks.

Best regards,
Zhihang

On 10/16/25 05:34, 'Kasturi Shekar' via isar-users wrote:
> The installer now conditionally includes the `mdadm` package,
> based on the presence of the `raid` feature in `MACHINE_FEATURES`
> Additionally, the device selection dialog is updated to exclude
> physical disks that are members of a RAID volume.
>
> Signed-off-by: Kasturi Shekar <kasturi.shekar@siemens.com>
> ---
>   .../images/isar-image-installer.bb             |  2 ++
>   .../files/usr/bin/deploy-image-wic.sh          | 18 ++++++++++++++++++
>   2 files changed, 20 insertions(+)
>
> diff --git a/meta-isar/recipes-core/images/isar-image-installer.bb b/meta-isar/recipes-core/images/isar-image-installer.bb
> index db379f5d..300591ab 100644
> --- a/meta-isar/recipes-core/images/isar-image-installer.bb
> +++ b/meta-isar/recipes-core/images/isar-image-installer.bb
> @@ -26,3 +26,5 @@ IMAGER_INSTALL:wic:append = " ${SYSTEMD_BOOTLOADER_INSTALL}"
>   IMAGE_INSTALL += "deploy-image-service"
>   
>   IMAGE_INSTALL:remove = "expand-on-first-boot"
> +
> +IMAGE_PREINSTALL:append = "${@ bb.utils.contains('MACHINE_FEATURES', 'raid', ' mdadm', '', d) }"
> 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 333762f1..778370b1 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
> @@ -60,6 +60,24 @@ if ! $installer_unattended; then
>       devices="$devices $mmc_devices"
>   
>       for device in $devices; do
> +        is_raid_member=0
> +
> +        if [ -d "/sys/block/$device/holders" ] && [ ! -d "/sys/block/$device/md" ]; then
> +            for holder_path in /sys/block/$device/holders/*; do
> +                holder_name=$(basename "$holder_path")
> +                case "$holder_name" in
> +                    md[0-9]*)
> +                        is_raid_member=1
> +                        break
> +                        ;;
> +                esac
> +            done
> +        fi
> +
> +        if [ "$is_raid_member" -eq 1 ]; then
> +            continue # Skip RAID member disks
> +        fi
> +
>           case $device in
>               loop*)
>                   # skip loop device

-- 
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/a29ef5e5-064a-49bf-acbd-4628ad88665a%40ilbers.de.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-10-24 15:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-16  3:34 [PATCH] isar-installer: add mdadm support and filter out RAID member disks 'Kasturi Shekar' via isar-users
2025-10-24 15:57 ` Zhihang Wei

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox