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

disks: wipe blockdev: improve variable locality/readability

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2021-06-02 13:11:55 +02:00
parent 70dc70984a
commit fa6d05ab24
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Diskmanage.pm
View File

@ -900,10 +900,6 @@ sub is_mounted {
sub wipe_blockdev { sub wipe_blockdev {
my ($devpath) = @_; my ($devpath) = @_;
my $wipefs_cmd = ['wipefs', '--all', $devpath];
my $dd_cmd = ['dd', 'if=/dev/zero', "of=${devpath}", 'bs=1M', 'conv=fdatasync'];
my $devname = basename($devpath); my $devname = basename($devpath);
my $dev_size = PVE::Tools::file_get_contents("/sys/class/block/$devname/size"); my $dev_size = PVE::Tools::file_get_contents("/sys/class/block/$devname/size");
@ -913,12 +909,14 @@ sub wipe_blockdev {
my $size = ($dev_size * 512 / 1024 / 1024); my $size = ($dev_size * 512 / 1024 / 1024);
my $count = ($size < 200) ? $size : 200; my $count = ($size < 200) ? $size : 200;
push @{$dd_cmd}, "count=${count}";
print "wiping disk/partition: ${devpath}\n"; print "wiping disk/partition: ${devpath}\n";
run_command($wipefs_cmd, errmsg => "error wiping labels for '${devpath}'"); run_command(['wipefs', '--all', $devpath], errmsg => "error wiping '${devpath}'");
run_command($dd_cmd, errmsg => "error wiping '${devpath}'");
run_command(
['dd', 'if=/dev/zero', "of=${devpath}", 'bs=1M', 'conv=fdatasync', "count=${count}"],
errmsg => "error wiping '${devpath}'",
);
} }
1; 1;