Merge pull request #2401 from OSInside/partprobe_optional_in_kiwi_lib

Don't consider missing partprobe a dracut error
OSInside · Dec 13, 2023 · b28f1bf · b28f1bf
2 parents ef2720b + b7bec19
commit b28f1bf
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/dracut/modules.d/99kiwi-lib/module-setup.sh b/dracut/modules.d/99kiwi-lib/module-setup.sh
@@ -15,16 +15,24 @@ depends() {
 install() {
     declare moddir=${moddir}
     inst_multiple \
-        blkid partx blockdev dd mkdir rmdir \
+        blkid blockdev dd mkdir rmdir \
         grep cut tail head tr bc true false mountpoint \
-        basename partprobe sfdisk sgdisk mkswap readlink lsblk \
+        basename sfdisk sgdisk mkswap readlink lsblk \
         btrfs xfs_growfs resize2fs \
         e2fsck btrfsck xfs_repair \
         vgs vgchange lvextend lvcreate lvresize pvresize \
         mdadm cryptsetup dialog \
         pv curl xz \
         dmsetup
     inst_multiple -o dolly
+    if type partx &> /dev/null;then
+        inst_multiple partx
+    elif type partprobe &> /dev/null;then
+        inst_multiple partprobe
+    else
+        dfatal "Either partx or partprobe is required"
+        exit 1
+    fi
     if [[ "$(uname -m)" =~ s390 ]];then
         inst_multiple fdasd parted
     fi