Merge pull request obeone#4 from dalazx/builtin_kernel_modules_fix

ehough · web-flow · commit b24dd37c13ac · 2018-06-06T22:40:57.000-07:00
Fixed the kernel module assertion to consider builtin modules
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -226,7 +226,7 @@ assert_kernel_mod() {
 
   log "checking for presence of kernel module: $moduleName"
 
-  lsmod | grep -Eq "^$moduleName\\s+"
+  lsmod | grep -Eq "^$moduleName\\s+" || [ -d "/sys/module/$moduleName" ]
 
   exit_on_failure "$moduleName module is not loaded on the Docker host's kernel (try: modprobe $moduleName)"
 }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ assert_kernel_mod() {`
`226`	`226`
`227`	`227`	`log "checking for presence of kernel module: $moduleName"`
`228`	`228`
`229`		`- lsmod \| grep -Eq "^$moduleName\\s+"`
	`229`	`+ lsmod \| grep -Eq "^$moduleName\\s+" \|\| [ -d "/sys/module/$moduleName" ]`
`230`	`230`
`231`	`231`	`exit_on_failure "$moduleName module is not loaded on the Docker host's kernel (try: modprobe $moduleName)"`
`232`	`232`	`}`