proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-11-02 18:42:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

follouwp: code cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-02-08 15:25:03 +01:00
parent b436dca874
commit e45cc727e6
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/API2/Ceph/OSD.pm
View File

@ -415,11 +415,10 @@ __PACKAGE__->register_method ({
my ($dev, $path, $fstype) = split(/\s+/, $line);
next if !($dev && $path && $fstype);
next if $dev !~ m|^/dev/|;
if ($path eq $mountpoint) {
my ($data_part) = abs_path($dev) =~ m|^(/.+)|
or die "invalid path: $path \n"; # untaint $part
push @$partitions_to_remove, $data_part;
if ($path eq $mountpoint) {
abs_path($dev) =~ m|^(/.+)| or die "invalid dev: $dev\n";
push @$partitions_to_remove, $1;
last;
}
}
@ -427,12 +426,8 @@ __PACKAGE__->register_method ({
}
foreach my $path (qw(journal block block.db block.wal)) {
my ($part) = abs_path("$mountpoint/$path") =~ m|^(/.+)|
or die "invalid path: $path \n"; # untaint $part
if ($part) {
push @$partitions_to_remove, $part;
}
abs_path("$mountpoint/$path") =~ m|^(/.+)| or die "invalid path: $path\n";
push @$partitions_to_remove, $1;
}
}