[pve-devel] [PATCH V2 pve-zsync] fix #1004 adapt regex to new schema
Wolfgang Link
w.link at proxmox.com
Thu Jun 2 10:28:19 CEST 2016
---
pve-zsync | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pve-zsync b/pve-zsync
index 212ada9..cc566b4 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;
--
2.1.4
More information about the pve-devel
mailing list