From b646e132020532e2b1325c1f7ba97e87fb3e3d28 Mon Sep 17 00:00:00 2001 From: KIMATA Tetsuya Date: Sun, 28 Nov 2021 11:08:27 +0900 Subject: [PATCH] feat: Samba friendly snapshot name --- sanoid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sanoid b/sanoid index 13ea085e..ba81874f 100755 --- a/sanoid +++ b/sanoid @@ -546,7 +546,7 @@ sub take_snapshots { my @snapshots; foreach my $type (@types) { - my $snapname = "autosnap_$datestamp{'sortable'}_$type"; + my $snapname = "autosnap_${type}_UTC_$datestamp{'sortable'}"; push(@snapshots, $snapname); } @@ -827,11 +827,11 @@ sub getsnaps { } foreach my $snap (@rawsnaps) { - my ($fs,$snapname,$snapdate) = ($snap =~ m/(.*)\@(.*ly)\t*creation\t*(\d*)/); + my ($fs,$snapname,$snapdate) = ($snap =~ m/(.*)\@([^\t]+)\t*creation\t*(\d*)/); # avoid pissing off use warnings if (defined $snapname) { - my ($snaptype) = ($snapname =~ m/.*_(\w*ly)/); + my ($snaptype) = ($snapname =~ m/_(\w*ly)_/); if ($snapname =~ /^autosnap/) { $snaps{$fs}{$snapname}{'ctime'}=$snapdate; $snaps{$fs}{$snapname}{'type'}=$snaptype;