Drop root only resize restriction

The current kiwi-resize code was restricted to the root
partition for historical reasons. As in a partition table
only the last partition can resize, this should be the only
limitation for the resize code to perform its job. In
connection with the rd.kiwi.install.retain_last feature
it is also very likely that the last partition is not
the root partition but it should be properly restored by
the resize code after deployment

Author: schaefi

dracut/modules.d/55kiwi-dump/kiwi-dump-image.sh

@@ -409,9 +409,6 @@ function dump_image {
             report_and_quit "Failed to install image"
         fi
     fi
-    if [ "${count}" -gt 0 ]; then
-        recreate_last_partition "${image_target}"
-    fi
 }
 
 function fetch_local_partition_table {
@@ -490,28 +487,6 @@ function optimize_count_for_32k_blocksize {
     echo "${count}"
 }
 
-function recreate_last_partition {
-    local image_target=$1
-    local table_type
-    table_type=$(get_partition_table_type "${image_target}")
-    if [ "${table_type}" = "gpt" ];then
-        relocate_gpt_at_end_of_disk "${image_target}"
-    fi
-    sfdisk -d "${image_target}" > /tmp/parttable 2>/dev/null
-    head -n -1 /tmp/parttable > /tmp/parttable_1
-    tail -n 1 /tmp/parttable > /tmp/parttable_2
-    if [ "${table_type}" = "gpt" ];then
-        sed -ie "s@\(/dev/.* : start=.*\), size=.*, \(type=.*, uuid=.*, name=\".*\"\)@\1, \2@" \
-        /tmp/parttable_2
-    else
-        sed -ie "s@\(/dev/.* : start=.*\), size=.*, \(type=.*\)@\1, \2@" \
-        /tmp/parttable_2
-    fi
-    cat /tmp/parttable_1 /tmp/parttable_2 > /tmp/parttable
-    set_device_lock "${image_target}" \
-        sfdisk -f "${image_target}" < /tmp/parttable
-}
-
 function dump_local_image {
     local image_source=$1
     local image_target=$2

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

@@ -47,20 +47,42 @@ function initialize {
         export disk
     fi
 
-    root_device=${root#block:}
-    export root_device
+    last_device=$(get_last_partition_device "${disk}")
+    export last_device
 
     disk_free_mbytes=$((
         $(get_free_disk_bytes "${disk}") / 1048576
     ))
     export disk_free_mbytes
 
     disk_root_mbytes=$((
-        $(get_block_device_kbsize "${root_device}") / 1024
+        $(get_block_device_kbsize "${last_device}") / 1024
     ))
     export disk_root_mbytes
 }
 
+function get_last_partition_id_from_config_file {
+    # """
+    # Read the partition id with the biggest value from
+    # config.partids. This method will be replaced by
+    # get_last_partition_id() in the future. As of today
+    # there is still code in 59kiwi-lib which reads
+    # the imported variables from config.partids. This
+    # code needs to be refactored first before we can
+    # get rid of config.partids
+    # """
+    local partition_ids=/config.partids
+    local partid=1
+    local partid_cur
+    while read -r partname; do
+        partid_cur=$(echo "${partname}" | cut -f2 -d= | tr -d \")
+        if [ "${partid_cur}" -gt "${partid}" ];then
+            partid="${partid_cur}"
+        fi
+    done < "${partition_ids}"
+    echo "${partid}"
+}
+
 function deactivate_device_mappings {
     if lvm_system;then
         deactivate_volume_group
@@ -74,10 +96,11 @@ function deactivate_device_mappings {
 }
 
 function finalize_disk_repart {
-    declare kiwi_RootPart=${kiwi_RootPart}
+    local kiwi_ResizePart
+    kiwi_ResizePart=$(get_last_partition_id_from_config_file)
     finalize_partition_table "${disk}"
     set_root_map \
-        "$(get_partition_node_name "${disk}" "${kiwi_RootPart}")"
+        "$(get_partition_node_name "${disk}" "${kiwi_ResizePart}")"
 }
 
 function get_target_rootpart_size {
@@ -103,9 +126,14 @@ function repart_standard_disk {
     # pX+1: ( root )  [+luks +raid]
     # -------------------------------------
     # """
-    declare kiwi_RootPart=${kiwi_RootPart}
     local kiwi_oemrootMB
+    local kiwi_ResizePart
+    local command_query
+    local root_part_size
+    local part_name
     kiwi_oemrootMB=$(get_target_rootpart_size)
+    kiwi_ResizePart=$(get_last_partition_id_from_config_file)
+    part_name=$(sfdisk --part-label "${disk}" "${kiwi_ResizePart}")
     if [ -z "${kiwi_oemrootMB}" ];then
         local disk_have_root_system_mbytes=$((
             disk_root_mbytes + disk_free_mbytes
@@ -129,21 +157,20 @@ function repart_standard_disk {
     # deactivate all active device mappings
     deactivate_device_mappings
     # repart root partition
-    local command_query
-    local root_part_size=+${disk_have_root_system_mbytes}M
+    root_part_size=+${disk_have_root_system_mbytes}M
     if [ -z "${kiwi_oemrootMB}" ];then
         # no new parts and no rootsize limit, use rest disk space
         root_part_size=.
     fi
     command_query="
-        d ${kiwi_RootPart}
-        n p:lxroot ${kiwi_RootPart} . ${root_part_size}
+        d ${kiwi_ResizePart}
+        n ${part_name} ${kiwi_ResizePart} . ${root_part_size}
     "
     if mdraid_system; then
        command_query="
-          d ${kiwi_RootPart}
-          n p:lxraid ${kiwi_RootPart} . ${root_part_size}
-          t ${kiwi_RootPart} fd
+          d ${kiwi_ResizePart}
+          n ${part_name} ${kiwi_ResizePart} . ${root_part_size}
+          t ${kiwi_ResizePart} fd
        "
     fi
     if ! create_partitions "${disk}" "${command_query}";then
@@ -165,9 +192,14 @@ function repart_lvm_disk {
     # pX+1: ( LVM  )  [+luks +raid]
     # -------------------------------------
     # """
-    declare kiwi_RootPart=${kiwi_RootPart}
     local kiwi_oemrootMB
+    local kiwi_ResizePart
+    local command_query
+    local lvm_part_size
+    local part_name
     kiwi_oemrootMB=$(get_target_rootpart_size)
+    kiwi_ResizePart=$(get_last_partition_id_from_config_file)
+    part_name=$(sfdisk --part-label "${disk}" "${kiwi_ResizePart}")
     if [ -z "${kiwi_oemrootMB}" ];then
         local disk_have_root_system_mbytes=$((
             disk_root_mbytes + disk_free_mbytes
@@ -195,16 +227,15 @@ function repart_lvm_disk {
     # create lvm.conf appropriate for resize
     setup_lvm_config
     # repart lvm partition
-    local command_query
-    local lvm_part_size=+${disk_have_root_system_mbytes}M
+    lvm_part_size=+${disk_have_root_system_mbytes}M
     if [ -z "${kiwi_oemrootMB}" ];then
         # no rootsize limit, use rest disk space
         lvm_part_size=.
     fi
     command_query="
-        d ${kiwi_RootPart}
-        n p:lxlvm ${kiwi_RootPart} . ${lvm_part_size}
-        t ${kiwi_RootPart} 8e
+        d ${kiwi_ResizePart}
+        n ${part_name} ${kiwi_ResizePart} . ${lvm_part_size}
+        t ${kiwi_ResizePart} 8e
     "
     if ! create_partitions "${disk}" "${command_query}";then
         die "Failed to create partition table"
@@ -284,10 +315,10 @@ if luks_system "${disk}";then
 fi
 
 # wait for the root device to appear
-wait_for_storage_device "${root_device}"
+wait_for_storage_device "${last_device}"
 
 # check if repart/resize is wanted
-if ! resize_wanted "${root_device}" "${disk}"; then
+if ! resize_wanted "${last_device}" "${disk}"; then
     return
 fi
 
@@ -297,7 +328,7 @@ if [ "$(get_partition_table_type "${disk}")" = 'gpt' ];then
 fi
 
 # wait for the root device to appear
-wait_for_storage_device "${root_device}"
+wait_for_storage_device "${last_device}"
 
 # resize disk partition table
 if lvm_system;then
@@ -328,4 +359,4 @@ else
 fi
 
 # wait for the root device to appear
-wait_for_storage_device "${root_device}"
+wait_for_storage_device "${last_device}"

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

@@ -213,6 +213,37 @@ function get_partition_node_name {
     return 1
 }
 
+function recreate_last_partition {
+    local image_target=$1
+    local table_type
+    table_type=$(get_partition_table_type "${image_target}")
+    if [ "${table_type}" = "gpt" ];then
+        relocate_gpt_at_end_of_disk "${image_target}"
+    fi
+    sfdisk -d "${image_target}" > /tmp/parttable 2>/dev/null
+    head -n -1 /tmp/parttable > /tmp/parttable_1
+    tail -n 1 /tmp/parttable > /tmp/parttable_2
+    if [ "${table_type}" = "gpt" ];then
+        sed -ie "s@\(/dev/.* : start=.*\), size=.*, \(type=.*, uuid=.*, name=\".*\"\)@\1, \2@" \
+        /tmp/parttable_2
+    else
+        sed -ie "s@\(/dev/.* : start=.*\), size=.*, \(type=.*\)@\1, \2@" \
+        /tmp/parttable_2
+    fi
+    cat /tmp/parttable_1 /tmp/parttable_2 > /tmp/parttable
+    set_device_lock "${image_target}" \
+        sfdisk -f "${image_target}" < /tmp/parttable
+}
+
+function get_last_partition_device {
+    # """
+    # Get unix node of last partition in table
+    # """
+    local disk=$1
+    lsblk -p -n -r -o NAME,TYPE "${disk}" |\
+        grep -E "part|md$" | tail -n 1 | cut -f1 -d ' '
+}
+
 function get_last_partition_id {
     # """
     # Get index of last partition from the current table

kiwi/builder/disk.py

@@ -1210,7 +1210,7 @@ def _build_and_map_disk_partitions(
             if root_clone_count:
                 rootfs_mbsize = int(rootfs_mbsize / (root_clone_count + 1))
         else:
-            if self.oem_systemsize and not self.oem_resize:
+            if self.oem_systemsize:
                 rootfs_mbsize = self.oem_systemsize
             else:
                 rootfs_mbsize = 'all_free'

kiwi/schema/kiwi.rnc

@@ -1452,19 +1452,6 @@ div {
             ]
         ]
     ]
-    sch:pattern [
-        abstract = "true"
-        id = "image_expandable"
-        sch:rule [
-            context = "type[@$attr='true']"
-            sch:assert [
-                test = "oemconfig/oem-resize[contains(text(), 'false')]"
-                "$attr attribute also needs the setting: "
-                "<oem-resize>false</oem-resize> in the "
-                "<oemconfig> section of the selected <type>"
-            ]
-        ]
-    ]
     sch:pattern [
         abstract = "true"
         id = "image_verity_requirement"
@@ -1632,24 +1619,12 @@ div {
         ]
     k.type.spare_part_is_last.attribute =
         ## Specify if the spare partition should be the last one in
-        ## the partition table. Can only be configured for the oem
-        ## type with oem-resize switched off. By default the root
-        ## partition is the last one and the spare partition lives
-        ## before it. With this attribute that setup can be toggled.
-        ## However if the root partition is no longer the last one
-        ## the oem repart/resize code can no longer work because
-        ## the spare part would block it. Because of that moving
-        ## the spare part at the end of the disk is only applied
-        ## if oem-resize is switched off. There is a runtime
-        ## check in the kiwi code to check this condition
+        ## the partition table.
         attribute spare_part_is_last { xsd:boolean }
         >> sch:pattern [ id = "spare_part_is_last" is-a = "image_type"
             sch:param [ name = "attr" value = "spare_part_is_last" ]
             sch:param [ name = "types" value = "oem" ]
         ]
-        >> sch:pattern [ id = "spare_part_is_last_valid" is-a = "image_expandable"
-            sch:param [ name = "attr" value = "spare_part_is_last" ]
-        ]
     k.type.bootpartsize.attribute =
         ## For images with a separate boot partition this attribute
         ## specifies the size in MB. If not set the min bootpart

kiwi/schema/kiwi.rng

@@ -2196,11 +2196,6 @@ volume management system</a:documentation>
         <sch:assert test="vagrantconfig[@provider]">&lt;vagrantconfig&gt; section is required for the vagrant format</sch:assert>
       </sch:rule>
     </sch:pattern>
-    <sch:pattern abstract="true" id="image_expandable">
-      <sch:rule context="type[@$attr='true']">
-        <sch:assert test="oemconfig/oem-resize[contains(text(), 'false')]">$attr attribute also needs the setting: &lt;oem-resize&gt;false&lt;/oem-resize&gt; in the &lt;oemconfig&gt; section of the selected &lt;type&gt;</sch:assert>
-      </sch:rule>
-    </sch:pattern>
     <sch:pattern abstract="true" id="image_verity_requirement">
       <sch:rule context="type[@embed_verity_metadata]">
         <sch:assert test="@$attr">$attr attribute must be set for embed_verity_metadata</sch:assert>
@@ -2405,25 +2400,13 @@ Can only be configured for the disk image type oem</a:documentation>
     <define name="k.type.spare_part_is_last.attribute">
       <attribute name="spare_part_is_last">
         <a:documentation>Specify if the spare partition should be the last one in
-the partition table. Can only be configured for the oem
-type with oem-resize switched off. By default the root
-partition is the last one and the spare partition lives
-before it. With this attribute that setup can be toggled.
-However if the root partition is no longer the last one
-the oem repart/resize code can no longer work because
-the spare part would block it. Because of that moving
-the spare part at the end of the disk is only applied
-if oem-resize is switched off. There is a runtime
-check in the kiwi code to check this condition</a:documentation>
+the partition table.</a:documentation>
         <data type="boolean"/>
       </attribute>
       <sch:pattern id="spare_part_is_last" is-a="image_type">
         <sch:param name="attr" value="spare_part_is_last"/>
         <sch:param name="types" value="oem"/>
       </sch:pattern>
-      <sch:pattern id="spare_part_is_last_valid" is-a="image_expandable">
-        <sch:param name="attr" value="spare_part_is_last"/>
-      </sch:pattern>
     </define>
     <define name="k.type.bootpartsize.attribute">
       <attribute name="bootpartsize">