From fa6d05ab2475ff4b46e943b74fa54ef797191b23 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 2 Jun 2021 13:11:55 +0200 Subject: [PATCH] disks: wipe blockdev: improve variable locality/readability Signed-off-by: Thomas Lamprecht --- PVE/Diskmanage.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index ca6e2c7..e81692d 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -900,10 +900,6 @@ sub is_mounted { sub wipe_blockdev { 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 $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 $count = ($size < 200) ? $size : 200; - push @{$dd_cmd}, "count=${count}"; - print "wiping disk/partition: ${devpath}\n"; - run_command($wipefs_cmd, errmsg => "error wiping labels for '${devpath}'"); - run_command($dd_cmd, errmsg => "error wiping '${devpath}'"); + run_command(['wipefs', '--all', $devpath], errmsg => "error wiping '${devpath}'"); + + run_command( + ['dd', 'if=/dev/zero', "of=${devpath}", 'bs=1M', 'conv=fdatasync', "count=${count}"], + errmsg => "error wiping '${devpath}'", + ); } 1;