From 3d5526c1a7a76eacac139ba8eb8fe1d5b2f41cb0 Mon Sep 17 00:00:00 2001 From: Christoph Budziszewski Date: Tue, 4 Aug 2020 10:15:16 +0200 Subject: [PATCH 1/2] blkid returning 2 is not an error in this case --- lib/puppet/provider/logical_volume/lvm.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/puppet/provider/logical_volume/lvm.rb b/lib/puppet/provider/logical_volume/lvm.rb index d9eb4853..b0afb8bb 100644 --- a/lib/puppet/provider/logical_volume/lvm.rb +++ b/lib/puppet/provider/logical_volume/lvm.rb @@ -149,7 +149,18 @@ def create def destroy name_escaped = "#{@resource[:volume_group].gsub('-', '--')}-#{@resource[:name].gsub('-', '--')}" - if blkid(path) =~ %r{\bTYPE=\"(swap)\"} + begin + isswap = blkid(path) =~ %r{\bTYPE=\"(swap)\"} + rescue Puppet::ExecutionFailure => detail + ## If blkid returned 2, there is no filesystem present or the file doesn't exist. This should not be a failure. + if detail.message =~ %r{ returned 2:} + Puppet.debug(detail.message) + isswap = false + else + raise + end + end + if isswap swapoff(path) end dmsetup('remove', name_escaped) From a3065d887b2efec032dfa68033b94f337f84d2f7 Mon Sep 17 00:00:00 2001 From: Christoph Budziszewski Date: Tue, 4 Aug 2020 10:39:41 +0200 Subject: [PATCH 2/2] fixing inconsistent indentation --- 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 b0afb8bb..43e0f3bf 100644 --- a/lib/puppet/provider/logical_volume/lvm.rb +++ b/lib/puppet/provider/logical_volume/lvm.rb @@ -155,7 +155,7 @@ def destroy ## If blkid returned 2, there is no filesystem present or the file doesn't exist. This should not be a failure. if detail.message =~ %r{ returned 2:} Puppet.debug(detail.message) - isswap = false + isswap = false else raise end