From ed08668c343481ac820c24df157bce74a49eb700 Mon Sep 17 00:00:00 2001 From: Michael Hoffman Date: Mon, 19 Mar 2018 09:03:39 -0400 Subject: [PATCH 1/4] changed command for redhat family to modprobe to properly evaluate test --- libraries/linux_module.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/linux_module.rb b/libraries/linux_module.rb index d9695af..df2a066 100644 --- a/libraries/linux_module.rb +++ b/libraries/linux_module.rb @@ -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}" else "modinfo -n -v #{@module}" end From 3e2300bb678dd9b32c30d7cfec88c3819ab269e4 Mon Sep 17 00:00:00 2001 From: Michael Hoffman Date: Mon, 19 Mar 2018 10:42:34 -0400 Subject: [PATCH 2/4] added trimming to begin/end of output from modprobe for redhat --- libraries/linux_module.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/linux_module.rb b/libraries/linux_module.rb index df2a066..143c3a3 100644 --- a/libraries/linux_module.rb +++ b/libraries/linux_module.rb @@ -48,7 +48,7 @@ def loaded? def version modinfo_cmd = if inspec.os.redhat? || inspec.os.name == 'fedora' - "/sbin/modinfo -F version #{@module}" + "/sbin/modinfo -F version #{@module} | awk '{$1=$1;print}'" else "modinfo -F version #{@module}" end @@ -59,7 +59,7 @@ def version def command modinfo_cmd = if inspec.os.redhat? || inspec.os.name == 'fedora' - "/sbin/modprobe -n -v #{@module}" + "/sbin/modprobe -n -v #{@module} | awk '{$1=$1;print}'" else "modinfo -n -v #{@module}" end From 1128b39086d6b70018913bd67f402e6285944f80 Mon Sep 17 00:00:00 2001 From: Michael Hoffman Date: Mon, 19 Mar 2018 10:54:04 -0400 Subject: [PATCH 3/4] removed modinfo trim --- libraries/linux_module.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/linux_module.rb b/libraries/linux_module.rb index 143c3a3..18d44cf 100644 --- a/libraries/linux_module.rb +++ b/libraries/linux_module.rb @@ -48,7 +48,7 @@ def loaded? def version modinfo_cmd = if inspec.os.redhat? || inspec.os.name == 'fedora' - "/sbin/modinfo -F version #{@module} | awk '{$1=$1;print}'" + "/sbin/modinfo -F version #{@module}" else "modinfo -F version #{@module}" end From 9e796989632a8fa49dc23beae80dbfb3c02fe131 Mon Sep 17 00:00:00 2001 From: Michael Hoffman Date: Tue, 20 Mar 2018 08:16:25 -0400 Subject: [PATCH 4/4] command utilize modprobe for all linux systems --- libraries/linux_module.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/linux_module.rb b/libraries/linux_module.rb index 18d44cf..5650631 100644 --- a/libraries/linux_module.rb +++ b/libraries/linux_module.rb @@ -58,11 +58,7 @@ def version end def command - modinfo_cmd = if inspec.os.redhat? || inspec.os.name == 'fedora' - "/sbin/modprobe -n -v #{@module} | awk '{$1=$1;print}'" - else - "modinfo -n -v #{@module}" - end + modinfo_cmd = "/sbin/modprobe -n -v #{@module} | awk '{$1=$1;print}'" cmd = inspec.command(modinfo_cmd) cmd.exit_status.zero? ? cmd.stdout.delete("\n") : nil