fix: root repartitioning for root on raid: do not device lock not yet started RaidDev, set partition type to fd for raid, assemble once after repart with devicesize update

Author: Josef Ottl

dracut/modules.d/55kiwi-repart/kiwi-repart-disk.sh

@@ -124,9 +124,19 @@ function repart_standard_disk {
         d ${kiwi_RootPart}
         n p:lxroot ${kiwi_RootPart} . ${root_part_size}
     "
+    if mdraid_system; then
+       command_query="
+          d ${kiwi_RootPart}
+          n p:lxraid ${kiwi_RootPart} . ${root_part_size}
+          t ${kiwi_RootPart} fd
+       "
+    fi
     if ! create_partitions "${disk}" "${command_query}";then
         die "Failed to create partition table"
     fi
+    if mdraid_system; then
+        update_device_size_mdraid
+    fi
     # finalize table changes
     finalize_disk_repart
 }

dracut/modules.d/59kiwi-lib/kiwi-mdraid-lib.sh

@@ -14,17 +14,24 @@ function mdraid_system {
 
 function deactivate_mdraid {
     declare kiwi_RaidDev=${kiwi_RaidDev}
-    mdadm --stop "${kiwi_RaidDev}"
+    set_device_lock "${kiwi_RaidDev}" \
+       mdadm --stop "${kiwi_RaidDev}"
 }
 
 function activate_mdraid {
     declare kiwi_RaidDev=${kiwi_RaidDev}
-    set_device_lock "${kiwi_RaidDev}" \
-        mdadm --assemble --scan "${kiwi_RaidDev}"
+    mdadm --assemble --scan "${kiwi_RaidDev}"
     wait_for_storage_device "${kiwi_RaidDev}"
     set_root_map "${kiwi_RaidDev}"
 }
 
+function update_devicesize_mdraid {
+    declare kiwi_RaidDev=${kiwi_RaidDev}
+    mdadm --assemble --scan "${kiwi_RaidDev}" --update=devicesize
+    wait_for_storage_device "${kiwi_RaidDev}"
+    deactivate_mdraid
+}
+
 function resize_mdraid {
     declare kiwi_RaidDev=${kiwi_RaidDev}
     set_device_lock "${kiwi_RaidDev}" \