Skip to content

Fix 433: insert_modules: Ignore modprobe's return code #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix 433: insert_modules: Ignore modprobe's return code #891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion package/base-files/files/lib/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,10 @@ insert_modules() {
if [ -f /etc/modules.d/$m ]; then
sed 's/^[^#]/insmod &/' /etc/modules.d/$m | ash 2>&- || :
else
modprobe $m
# Since busybox modprobe returns 0 on loading non-existing
# and 255 on loading already loaded modules
# its return-code is not useful
modprobe $m || true
Copy link
Contributor

@yousong yousong Mar 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better make it modprobe; [ "$?" = 0 -o "$?" = 255 ] and adapt the comment accordingly

Copy link
Author

@yanosz yanosz Mar 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm... I don't agree.
This code doesn't ignore modprobe's return code. I think, we should do so, since its bogus

Thus I don't like to make "255" explicit and go for ignoring modprobe's return code at all.
I think, that there's a semantic difference.

If you are aware of specific return code, that should be taken into account, I'm happy with mapping that option to some error value.

Copy link
Contributor

@yousong yousong Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, got it. thanks for the efforts ;)

fi
done
}
Expand Down