Fix filesystem type detection #93
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -16,7 +16,7 @@ def destroy | |||
| end | |||
|
|
|||
| def fstype | |||
| /TYPE=\"(\S+)\"/.match(blkid(@resource[:name]))[1] | |||
| / TYPE=\"(\S+)\"/.match(blkid(@resource[:name]))[1] | |||
There was a problem hiding this comment.
Shouldn't that be
/\bTYPE=\"(\S+)\"/.match(blkid(@resource[:name]))[1]?
There was a problem hiding this comment.
+1 for boundary matching, instead of space character.
|
Thanks @mhaskel. I also agree and added acomit to change this. Should I squash both commits into one? I never know which is best. |
Sometimes `blkid` shows a `SEC_TYPE="ext2"` in addition to `TYPE="ext3"`. It has something to do with a filesystem being backwards compatible with ext2. This commit fixes the regex that matches TYPE=.. to prevent it from matching SEC_TYPE.
ckaenzig
force-pushed
the
fix-fstype-detection
branch
from
db6bd79
to
4694b25
Compare
|
Squashed on @raphink's advice. |
underscorgan
pushed a commit
that referenced
this pull request
Feb 4, 2015
Fix filesystem type detection
|
Thanks for the contribution @ckaenzig ! |
cegeka-jenkins
pushed a commit
to cegeka/puppet-lvm
that referenced
this pull request
Oct 23, 2017
Fix filesystem type detection
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sometimes
blkidshows aSEC_TYPE="ext2"in addition toTYPE="ext3".It has something to do with a filesystem being backwards compatible with
ext2. This commit fixes the regex that matches TYPE=.. to prevent it
from matching SEC_TYPE.
Unfortunately I couldn't figure out how to add a test case for this. Any advice welcome if you think a test is necessary, thanks!