Fix trigger of CDI refresh service

[elezar]

This change also allows the nvidia-cdi-refresh.service to execute when the nvidia-current kernel module is present instead of restricting this to the nvidia
module.

Fixes #1395

[elezar]

/cherry-pick release-1.18

[ArangoGutierrez]

on #1395 @tr4cks proposes

ExecCondition=/usr/bin/grep -qE '/nvidia(-current)?\.ko' /lib/modules/%v/modules.dep

What do you think

[elezar]

I don't really have a strong feeling on this -- although I though the explicit OR to be more easily readable instead of trying to parse a more complex regex. It should strictly speaking be:

Suggested change

	ExecCondition=/usr/bin/grep -qE '/nvidia.ko|/nvidia-current.ko' /lib/modules/%v/modules.dep
	ExecCondition=/usr/bin/grep -qE '/nvidia\.ko|/nvidia-current\.ko' /lib/modules/%v/modules.dep

Anyway.

[tr4cks]

I agree, it's more meaningful, especially if you need to add something else in the future.

However, I might have done it this way. Without forgetting the $ at the end if you don't want it to match nividia.ko.someting-else. But maybe that's what you want, I don't know, I don't have the context.

ExecCondition=/usr/bin/grep -qE '/(nvidia|nvidia-current)\.ko$' /lib/modules/%v/modules.dep

[elezar]

On one system I checked, I don't think that the $ will do what we wanted:

$ cat modules.dep | grep -E '/nvidia\.ko\:'
updates/dkms/nvidia.ko:

Note the trailing .ko:.

I think what we may want is:

$ cat /lib/modules/6.11.0-1013-nvidia-64k/modules.dep | grep -E '/(nvidia|nvidia-current)\.ko[:]'
updates/dkms/nvidia.ko:

[elezar]

Actually: looking at https://man7.org/linux/man-pages/man5/modules.dep.5.html it is stated that:

These files are not intended for editing or use by any additional
utilities as their format is subject to change in the future. You
should use the modinfo(8) command to obtain information about
modules in a future proof and compatible fashion rather than
touching these files.

Does modinfo nvidia --field version work as expected on your system where the module file is nvidia-current.ko?

I get:

$ modinfo nvidia --field version
580.82.07

[tr4cks]

No, it doesn't work.

$ modinfo nvidia --field version
modinfo: ERROR: Module nvidia not found.

Here are the available modules:

$ modinfo nvidia-
nvidia-current           nvidia-current-modeset   nvidia-current-uvm
nvidia-current-drm       nvidia-current-peermem   nvidia-wmi-ec-backlight
$ modinfo nvidia-

So forced to do this with nvidia-current:

$ modinfo nvidia-current --field version
535.247.01

In addition, the executable is located in the /usr/sbin/modinfo path, and I am not sure if it is always in the same place on all systems—to be verified.

$ whereis modinfo
modinfo: /usr/sbin/modinfo /usr/share/man/man8/modinfo.8.gz

[tr4cks]

After doing some research, I think your method is probably the best compromise. It would also be possible to search for modules in the file system, but that would require executing more complicated commands with pipes.

It would probably be necessary to iterate and track the changes.