emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init.d/modules.in: Avoid loading modules twice in Linux with dash shell

Browse Source 
Since commit 6b475ab269, openrc tries to load
modules twice which have been defined in /etc/conf.d/modules via modules=
variable when /bin/sh points to dash shell.
The reason is that when the "modules-load" service was merged into "modules"
service, the "modules" variable name got used in both, load_modules()
function and in Linux_modules() function which both get called when modules
service is started. Although "modules" variable is marked as local in
load_modules(), dash simply ignores this.

Avoid the issue by renaming "modules" variable to "_modules" in
load_modules() function.

This fixes #419.
This commit is contained in:
Lars Wendler 2021-05-12 21:01:06 +02:00 committed by William Hubbs
parent 791322d7fa
commit 0d86c4903b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init.d/modules.in
View File

@ -41,18 +41,18 @@ find_modfiles()
load_modules() load_modules()
{ {
local file m modules rc x local file m _modules rc x
file=$1 file=$1
[ -z "$file" ] && return 0 [ -z "$file" ] && return 0
while read m x; do while read m x; do
case $m in case $m in
\;*) continue ;; \;*) continue ;;
\#*) continue ;; \#*) continue ;;
*) modules="$modules $m" *) _modules="$_modules $m"
;; ;;
esac esac
done < $file done < $file
for x in $modules; do for x in $_modules; do
ebegin "Loading module $x" ebegin "Loading module $x"
case "$RC_UNAME" in case "$RC_UNAME" in
FreeBSD) kldload "$x"; rc=$? ;; FreeBSD) kldload "$x"; rc=$? ;;