From: Wolfgang Link <w.link@proxmox.com>
Date: Thu, 2 Jun 2016 08:28:19 +0000 (+0200)
Subject: fix #1004 adapt regex to new schema
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e5f52a63a8ecf9fede49614ebd20775e38ec6042;p=pve-zsync.git

fix #1004 adapt regex to new schema
---

diff --git a/pve-zsync b/pve-zsync
index 212ada9..ff9ee8f 100644
--- a/pve-zsync
+++ b/pve-zsync
@@ -763,9 +763,17 @@ sub parse_disks {
 
 	my $disk = undef;
 	my $stor = undef;
-	if($line =~ m/^(?:((?:virtio|ide|scsi|sata|mp)\d+)|rootfs): ([^:]+:)([A-Za-z0-9\-]+),(.*)$/) {
-	    $disk = $3;
-	    $stor = $2;
+	if($line =~ m/^(?:(?:(?:virtio|ide|scsi|sata|mp)\d+)|rootfs): (.*)$/) {
+	    my @parameter = split(/,/,$1);
+
+	    foreach my $opt (@parameter) {
+		if ($opt =~ m/^(?:file=|volume=)?([^:]+:)([A-Za-z0-9\-]+)$/){
+		    $disk = $2;
+		    $stor = $1;
+		    last;
+		}
+	    }
+
 	} else {
 	    print "Disk: \"$line\" will not include in pve-sync\n" if $get_err || $error;
 	    next;