From fb912da448ec4090150e9f6c583c43bf6376348e Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Tue, 28 Apr 2015 17:46:38 +0200 Subject: [PATCH] btrbk: bugfix: allow "/" as volume name --- ChangeLog | 1 + btrbk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2067b53..71d6609 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ btrbk-current * Added configuration option "snapshot_name" (closes: #5). * Bugfix: allow "0" as subvolume name (closes: #10). + * Bugfix: allow "/" as volume name (closes: #15). * Bugfix: check source AND targets for determining snapshot postfix (closes: #11). diff --git a/btrbk b/btrbk index 614bcd7..0399d72 100755 --- a/btrbk +++ b/btrbk @@ -399,7 +399,7 @@ sub parse_config(@) # be very strict about file options, for security sake return undef unless(check_file($value, { absolute => 1, ssh => 1 }, $key, $file)); - $value =~ s/\/+$//; # remove trailing slash + $value =~ s/\/+$// unless($value =~ /^\/+$/); # remove trailing slash $value =~ s/^\/+/\//; # sanitize leading slash TRACE "config: adding volume \"$value\" to root context"; my $volume = { CONTEXT => "volume",