mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2025-06-13 01:52:08 +00:00
[no-relnote] Minor code cleanup in WSL2 discoverer
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
parent
0c905d0de2
commit
b66d37bedb
@ -40,13 +40,12 @@ var requiredDriverStoreFiles = []string{
|
|||||||
|
|
||||||
// newWSLDriverDiscoverer returns a Discoverer for WSL2 drivers.
|
// newWSLDriverDiscoverer returns a Discoverer for WSL2 drivers.
|
||||||
func newWSLDriverDiscoverer(logger logger.Interface, driverRoot string, hookCreator discover.HookCreator, ldconfigPath string) (discover.Discover, error) {
|
func newWSLDriverDiscoverer(logger logger.Interface, driverRoot string, hookCreator discover.HookCreator, ldconfigPath string) (discover.Discover, error) {
|
||||||
err := dxcore.Init()
|
if err := dxcore.Init(); err != nil {
|
||||||
if err != nil {
|
return nil, fmt.Errorf("failed to initialize dxcore: %w", err)
|
||||||
return nil, fmt.Errorf("failed to initialize dxcore: %v", err)
|
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := dxcore.Shutdown(); err != nil {
|
if err := dxcore.Shutdown(); err != nil {
|
||||||
logger.Warningf("failed to shutdown dxcore: %v", err)
|
logger.Warningf("failed to shutdown dxcore: %w", err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@ -61,7 +60,7 @@ func newWSLDriverDiscoverer(logger logger.Interface, driverRoot string, hookCrea
|
|||||||
|
|
||||||
driverStorePaths = append(driverStorePaths, "/usr/lib/wsl/lib")
|
driverStorePaths = append(driverStorePaths, "/usr/lib/wsl/lib")
|
||||||
|
|
||||||
libraries := discover.NewMounts(
|
driverStoreMounts := discover.NewMounts(
|
||||||
logger,
|
logger,
|
||||||
lookup.NewFileLocator(
|
lookup.NewFileLocator(
|
||||||
lookup.WithLogger(logger),
|
lookup.WithLogger(logger),
|
||||||
@ -76,14 +75,14 @@ func newWSLDriverDiscoverer(logger logger.Interface, driverRoot string, hookCrea
|
|||||||
|
|
||||||
symlinkHook := nvidiaSMISimlinkHook{
|
symlinkHook := nvidiaSMISimlinkHook{
|
||||||
logger: logger,
|
logger: logger,
|
||||||
mountsFrom: libraries,
|
mountsFrom: driverStoreMounts,
|
||||||
hookCreator: hookCreator,
|
hookCreator: hookCreator,
|
||||||
}
|
}
|
||||||
|
|
||||||
ldcacheHook, _ := discover.NewLDCacheUpdateHook(logger, libraries, hookCreator, ldconfigPath)
|
ldcacheHook, _ := discover.NewLDCacheUpdateHook(logger, driverStoreMounts, hookCreator, ldconfigPath)
|
||||||
|
|
||||||
d := discover.Merge(
|
d := discover.Merge(
|
||||||
libraries,
|
driverStoreMounts,
|
||||||
symlinkHook,
|
symlinkHook,
|
||||||
ldcacheHook,
|
ldcacheHook,
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user