changed command for redhat family to modprobe to properly evaluate test #10
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
|
@crashdummymch Thank you very much, once you've rebased, this should turn green. |
|
Is this fixing #4? |
…into linux_command_modprobe
|
this fixes #4 |
chris-rock
requested changes
Mar 20, 2018
libraries/linux_module.rb
Outdated
| @@ -59,7 +59,7 @@ def version | |||
|
|
|||
| def command | |||
| modinfo_cmd = if inspec.os.redhat? || inspec.os.name == 'fedora' | |||
| "/sbin/modinfo -n -v #{@module}" | |||
| "/sbin/modprobe -n -v #{@module} | awk '{$1=$1;print}'" | |||
| else | |||
| "modinfo -n -v #{@module}" | |||
There was a problem hiding this comment.
It seems that we need to use modprobe here too, even on ubuntu the -v flag is not available:
root@9d282e26d262:/# modinfo -h
Usage:
modinfo [options] filename [args]
Options:
-a, --author Print only 'author'
-d, --description Print only 'description'
-l, --license Print only 'license'
-p, --parameters Print only 'parm'
-n, --filename Print only 'filename'
-0, --null Use \0 instead of \n
-F, --field=FIELD Print only provided FIELD
-k, --set-version=VERSION Use VERSION instead of `uname -r`
-b, --basedir=DIR Use DIR as filesystem root for /lib/modules
-V, --version Show version
-h, --help Show this help
In addition, /sbin/modprobe works on ubuntu too, therefore I do not think we need to distinguish between redhat and other linux platforms here
There was a problem hiding this comment.
removed condition logic so that all linux systems utilize modprobe for detecting module status
added 2 commits
March 20, 2018 08:15
…into linux_command_modprobe
libraries/linux_module.rb
Outdated
| @@ -59,7 +59,7 @@ def version | |||
|
|
|||
| def command | |||
| modinfo_cmd = if inspec.os.redhat? || inspec.os.name == 'fedora' | |||
| "/sbin/modinfo -n -v #{@module}" | |||
| "/sbin/modprobe -n -v #{@module} | awk '{$1=$1;print}'" | |||
| else | |||
| "modinfo -n -v #{@module}" | |||
There was a problem hiding this comment.
removed condition logic so that all linux systems utilize modprobe for detecting module status
rarenerd
approved these changes
Mar 20, 2018
Closed
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.
modinfo does not produce the correct output for the test and should use modprobe. Test currently always fails when using modinfo due to output not matching.