yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

followup: try to be a bit more like systemd-escape

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2019-02-20 16:31:25 +01:00
parent fc31916384
commit 4b5b01192e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/API2/Disks/Directory.pm
View File

@ -88,18 +88,25 @@ my $write_ini = sub {
}; };
sub systemd_escape { sub systemd_escape {
my ($val) = @_; my ($val, $is_path) = @_;
# NOTE: this is not complete, but enough for our needs. normally all # NOTE: this is not complete, but enough for our needs. normally all
# characters which are not alpha-numerical, '.' or '_' would need escaping # characters which are not alpha-numerical, '.' or '_' would need escaping
$val =~ s/\-/\\x2d/g; $val =~ s/\-/\\x2d/g;
if ($is_path) {
$val =~ s/^\///g;
$val =~ s/\/$//g;
}
$val =~ s/\//-/g;
return $val; return $val;
} }
sub systemd_unescape { sub systemd_unescape {
my ($val) = @_; my ($val) = @_;
$val =~ s/-/\//g;
$val =~ s/\\x([a-fA-F0-9]{2})/chr(hex($1))/eg; $val =~ s/\\x([a-fA-F0-9]{2})/chr(hex($1))/eg;
return $val; return $val;
@ -225,7 +232,7 @@ __PACKAGE__->register_method ({
my $worker = sub { my $worker = sub {
my $path = "/mnt/pve/$name"; my $path = "/mnt/pve/$name";
my $mountunitname = "mnt-pve-".systemd_escape($name).".mount"; my $mountunitname = systemd_escape($path, 1) . ".mount";
my $mountunitpath = "/etc/systemd/system/$mountunitname"; my $mountunitpath = "/etc/systemd/system/$mountunitname";
PVE::Diskmanage::locked_disk_action(sub { PVE::Diskmanage::locked_disk_action(sub {