Skip to content

Use chwd check option instead of awk #51

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

Open
ventureoo wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −2
Open

Use chwd check option instead of awk #51

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
6 changes: 4 additions & 2 deletions archiso/airootfs/usr/local/bin/nvidia-module-loader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ if [[ -e /sys/module/nvidia || -e /sys/module/nouveau ]]; then
fi

# Load compatible version of NVIDIA modules for current hardware
if chwd --list | awk '{ if($2 == "nouveau" || $2 == "nvidia-dkms-470xx" || $2 == "nvidia-dkms-580xx") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
if (chwd --check nouveau ||
chwd --check nvidia-dkms-470xx ||
chwd --check nvidia-dkms-580xx) 2>/dev/null; then
modprobe nouveau
elif chwd --list | awk '{ if($2 == "nvidia-open-dkms") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
elif chwd --check nvidia-open-dkms 2>/dev/null; then
# Load some basic dependencies of nvidia modules
modprobe video
modprobe drm_ttm_helper
Expand Down