Merge pull request #2869 from OSInside/consolidate_lock_method

Consolidate device lock into its own method

Author: Conan-Kudo

dracut/modules.d/99kiwi-lib/kiwi-filesystem-lib.sh

@@ -37,7 +37,7 @@ function resize_filesystem {
     local mpoint=/fs-resize
     local fstype
     fstype=$(probe_filesystem "${device}")
-    lock="udevadm lock --device ${device}"
+    lock="set_device_lock ${device}"
     case ${fstype} in
     ext2|ext3|ext4)
         resize_fs="${lock} resize2fs -f -p ${device}"
@@ -77,7 +77,7 @@ function check_filesystem {
     local check_fs_return_ok
     local fstype
     fstype=$(probe_filesystem "${device}")
-    lock="udevadm lock --device ${device}"
+    lock="set_device_lock ${device}"
     case ${fstype} in
     ext2|ext3|ext4)
         # The exit code by e2fsck is the sum of the following conditions:

dracut/modules.d/99kiwi-lib/kiwi-lib.sh

@@ -17,6 +17,19 @@ function get_system_id {
     blkid -s PTUUID -o value "${disk_device}"
 }
 
+function set_device_lock {
+    # """
+    # Set device lock, preferrable via udevadm or via
+    # flock as fallback if systemd/udev does not provide
+    # the command
+    # """
+    if udevadm lock --help &>/dev/null;then
+        udevadm lock --device "$@"
+    else
+        flock -x "$@"
+    fi
+}
+
 function disk_matches_system_identifier {
     local disk_device=$1
     local system_identifier=/system_identifier

dracut/modules.d/99kiwi-lib/kiwi-luks-lib.sh

@@ -74,7 +74,7 @@ function reencrypt_luks {
         setup_progress_fifo ${progress}
         (
             # reencrypt, this will overwrite all key slots
-            udevadm lock --device "${device}" cryptsetup reencrypt \
+            set_device_lock "${device}" cryptsetup reencrypt \
                 --progress-frequency 1 \
                 --key-file "${passphrase_file}" \
                 --key-slot "${keyslot}" \
@@ -102,7 +102,7 @@ function activate_luks {
         # but this requires to manually call luksOpen since
         # with systemd-cryptsetup we saw it still asking for
         # a passphrase
-        udevadm lock --device "${device}" cryptsetup \
+        set_device_lock "${device}" cryptsetup \
             --key-file /dev/zero \
             --keyfile-size 32 \
         luksOpen "${device}" luks

dracut/modules.d/99kiwi-lib/kiwi-lvm-lib.sh

@@ -63,7 +63,7 @@ function get_volume_path_for_volume {
 function resize_pyhiscal_volumes {
     local device
     device=$(get_root_map)
-    udevadm lock --device "${device}" pvresize "${device}"
+    set_device_lock "${device}" pvresize "${device}"
 }
 
 function resize_lvm_volumes_and_filesystems {

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

@@ -19,14 +19,14 @@ function deactivate_mdraid {
 
 function activate_mdraid {
     declare kiwi_RaidDev=${kiwi_RaidDev}
-    udevadm lock --device "${kiwi_RaidDev}" \
+    set_device_lock "${kiwi_RaidDev}" \
         mdadm --assemble --scan "${kiwi_RaidDev}"
     wait_for_storage_device "${kiwi_RaidDev}"
     set_root_map "${kiwi_RaidDev}"
 }
 
 function resize_mdraid {
     declare kiwi_RaidDev=${kiwi_RaidDev}
-    udevadm lock --device "${kiwi_RaidDev}" \
+    set_device_lock "${kiwi_RaidDev}" \
         mdadm --grow --size=max "${kiwi_RaidDev}"
 }

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

@@ -23,10 +23,10 @@ function create_partitions {
         ;;
     esac
     if type partprobe &> /dev/null;then
-        udevadm lock --device "${disk_device}" \
+        set_device_lock "${disk_device}" \
             partprobe "${disk_device}"
     else
-        udevadm lock --device "${disk_device}" \
+        set_device_lock "${disk_device}" \
             partx -u "${disk_device}"
     fi
 }
@@ -61,22 +61,22 @@ function create_msdos_partitions {
             start_sector_from[$partid]=$(
                 _get_msdos_partition_start_sector "${disk_device}" "${partid}"
             )
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sfdisk --force --delete "${disk_device}" "${partid}"
         ;;
         "n")
             # create a partition...
             partid=${cmd_list[$index + 2]}
             part_size_end=${cmd_list[$index + 4]}
             echo "${start_sector_from[$partid]},${part_size_end}" > /tmp/sfdisk.in
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sfdisk --force -N "${partid}" "${disk_device}" < /tmp/sfdisk.in
         ;;
         "t")
             # change a partition type...
             part_type=${cmd_list[$index + 2]}
             partid=${cmd_list[$index + 1]}
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sfdisk --force --change-id "${disk_device}" "${partid}" "${part_type}"
         ;;
         esac
@@ -112,7 +112,7 @@ function create_gpt_partitions {
         "d")
             # delete a partition...
             partid=${cmd_list[$index + 1]}
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sgdisk --delete "${partid}" "${disk_device}"
         ;;
         "n")
@@ -121,16 +121,16 @@ function create_gpt_partitions {
             partid=${cmd_list[$index + 2]}
             part_size_start=${cmd_list[$index + 3]}
             part_size_end=${cmd_list[$index + 4]}
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sgdisk --new "${partid}:${part_size_start}:${part_size_end}" "${disk_device}"
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sgdisk --change-name "${partid}:${part_name}" "${disk_device}"
         ;;
         "t")
             # change a partition type...
             part_type=${cmd_list[$index + 2]}
             partid=${cmd_list[$index + 1]}
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sgdisk --typecode "${partid}:$(_to_guid "${part_type}")" "${disk_device}"
         ;;
         esac
@@ -187,7 +187,7 @@ function create_dasd_partitions {
     done
     echo "w" >> ${partition_setup_file}
     echo "q" >> ${partition_setup_file}
-    udevadm lock --device "${disk_device}" \
+    set_device_lock "${disk_device}" \
         fdasd "${disk_device}" < ${partition_setup_file} 1>&2
 }
 
@@ -342,7 +342,7 @@ function get_partition_uuid {
 }
 
 function relocate_gpt_at_end_of_disk {
-    if ! udevadm lock --device "$1" sfdisk --relocate gpt-bak-std "$1";then
+    if ! set_device_lock "$1" sfdisk --relocate gpt-bak-std "$1";then
         die "Failed to write backup GPT at end of disk"
     fi
 }
@@ -384,7 +384,7 @@ function activate_boot_partition {
     pt_table_type=$(get_partition_table_type "${disk_device}")
     if [[ "$(uname -m)" =~ i.86|x86_64 ]];then
         if [ "${pt_table_type}" = "dos" ];then
-            udevadm lock --device "${disk_device}" \
+            set_device_lock "${disk_device}" \
                 sfdisk --activate "${disk_device}" "${boot_partition_id}"
         fi
     fi
@@ -400,7 +400,7 @@ function create_hybrid_gpt {
         # see man sgdisk for details
         partition_count=3
     fi
-    if ! udevadm lock --device "${disk_device}" \
+    if ! set_device_lock "${disk_device}" \
         sgdisk -h "$(seq -s : 1 "${partition_count}")" "${disk_device}"
     then
         die "Failed to create hybrid GPT/MBR !"

dracut/modules.d/99kiwi-lib/module-setup.sh

@@ -23,7 +23,7 @@ install() {
         vgs vgchange lvextend lvcreate lvresize pvresize \
         mdadm cryptsetup dialog \
         pv curl xz sha256sum sed \
-        dmsetup touch chmod
+        dmsetup touch chmod flock
     inst_multiple -o dolly
     if type partx &> /dev/null;then
         inst_multiple partx