Skip to content

blkid returning 2 is not an error in this case #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

blkid returning 2 is not an error in this case #258

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d5526c
blkid returning 2 is not an error in this case
cbudziszewski Aug 4, 2020
a3065d8
fixing inconsistent indentation
cbudziszewski Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/puppet/provider/logical_volume/lvm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down