diskmanage: allow passing partitions to get_disks

Requires that the $include_partitions parameter is set too, which:
1. Makes sense, because the partition won't be included in the result
   otherwise.
2. Ensures backwards compatibility for existing callers that don't
   use $include_partitions. No existing callers use both $disks and
   $include_partitions at the same time, so nothing learns to
   "support" partitions by accident.

Moving the strip_dev helper to the top, so it can be used everywhere.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index e4f3d05d68480e9a1b45c78235a8bf6d256f8332..36f452c46d775c5aba6f52e964ff6ac21436af7f 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -20,6 +20,12 @@ my $PVS = "/sbin/pvs";
 my $LVS = "/sbin/lvs";
 my $LSBLK = "/bin/lsblk";
 
+my sub strip_dev :prototype($) {
+    my ($devpath) = @_;
+    $devpath =~ s|^/dev/||;
+    return $devpath;
+}
+
 sub check_bin {
     my ($path) = @_;
     return -x $path;
@@ -518,6 +524,14 @@ sub get_disks {
        # we get cciss/c0d0 but need cciss!c0d0
        $_ =~ s|cciss/|cciss!| for @$disks;
 
+       if ($include_partitions) {
+           # Proper blockdevice is needed for the regex, use parent for partitions.
+           for my $disk ($disks->@*) {
+               next if !is_partition("/dev/$disk");
+               $disk = strip_dev(get_blockdev("/dev/$disk"));
+           }
+       }
+
        $disk_regex = "(?:" . join('|', @$disks) . ")";
     }
 
@@ -847,12 +861,6 @@ sub append_partition {
     return $partition;
 }
 
-my sub strip_dev :prototype($) {
-    my ($devpath) = @_;
-    $devpath =~ s|^/dev/||;
-    return $devpath;
-}
-
 # Check if a disk or any of its partitions has a holder.
 # Can also be called with a partition.
 # Expected to be called with a result of verify_blockdev_path().