From 707d72f13a8f126b773ccf825dfb6a2d2600bfbc Mon Sep 17 00:00:00 2001 From: Christoph Budziszewski Date: Mon, 3 Aug 2020 18:46:09 +0200 Subject: [PATCH 1/3] workaround: only call blkid if it has a filesystem --- lib/puppet/provider/logical_volume/lvm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/logical_volume/lvm.rb b/lib/puppet/provider/logical_volume/lvm.rb index d9eb4853..29201781 100644 --- a/lib/puppet/provider/logical_volume/lvm.rb +++ b/lib/puppet/provider/logical_volume/lvm.rb @@ -149,7 +149,7 @@ def create def destroy name_escaped = "#{@resource[:volume_group].gsub('-', '--')}-#{@resource[:name].gsub('-', '--')}" - if blkid(path) =~ %r{\bTYPE=\"(swap)\"} + if File.exist?(path) and blkid(path) =~ %r{\bTYPE=\"(swap)\"} swapoff(path) end dmsetup('remove', name_escaped) From ccf0464981baab0378444623412fc2cf5a4391dc Mon Sep 17 00:00:00 2001 From: Christoph Budziszewski Date: Mon, 3 Aug 2020 18:54:58 +0200 Subject: [PATCH 2/3] only call dmsetup on existing files as well --- lib/puppet/provider/logical_volume/lvm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/logical_volume/lvm.rb b/lib/puppet/provider/logical_volume/lvm.rb index 29201781..0cfa21e1 100644 --- a/lib/puppet/provider/logical_volume/lvm.rb +++ b/lib/puppet/provider/logical_volume/lvm.rb @@ -151,8 +151,8 @@ def destroy name_escaped = "#{@resource[:volume_group].gsub('-', '--')}-#{@resource[:name].gsub('-', '--')}" if File.exist?(path) and blkid(path) =~ %r{\bTYPE=\"(swap)\"} swapoff(path) + dmsetup('remove', name_escaped) end - dmsetup('remove', name_escaped) lvremove('-f', path) end From ffd3ff785d7659613d60d29426ae4167f7972f60 Mon Sep 17 00:00:00 2001 From: Christoph Budziszewski <46391274+cbudziszewski@users.noreply.github.com> Date: Mon, 3 Aug 2020 19:15:04 +0200 Subject: [PATCH 3/3] Update lib/puppet/provider/logical_volume/lvm.rb Co-authored-by: sanfrancrisko <55992494+sanfrancrisko@users.noreply.github.com> --- lib/puppet/provider/logical_volume/lvm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/logical_volume/lvm.rb b/lib/puppet/provider/logical_volume/lvm.rb index 0cfa21e1..c824774f 100644 --- a/lib/puppet/provider/logical_volume/lvm.rb +++ b/lib/puppet/provider/logical_volume/lvm.rb @@ -149,7 +149,7 @@ def create def destroy name_escaped = "#{@resource[:volume_group].gsub('-', '--')}-#{@resource[:name].gsub('-', '--')}" - if File.exist?(path) and blkid(path) =~ %r{\bTYPE=\"(swap)\"} + if File.exist?(path) && blkid(path) =~ %r{\bTYPE=\"(swap)\"} swapoff(path) dmsetup('remove', name_escaped) end