From 0c8379f6815cd5aa17b23c941c47ccfa8aed7cc8 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 1 Feb 2023 04:47:57 +0100 Subject: [PATCH] Fix nvidia-ctk path for update ldcache hook This change ensures that the update-ldcache hook is created in a manner consistent with other nvidia-ctk hooks ensuring that a full path is used. Without this change the update-ldcache hook on Tegra-based sytems had an invalid path. Signed-off-by: Evan Lezar --- internal/discover/ldconfig.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/internal/discover/ldconfig.go b/internal/discover/ldconfig.go index 83f26b36..e56f605a 100644 --- a/internal/discover/ldconfig.go +++ b/internal/discover/ldconfig.go @@ -21,7 +21,6 @@ import ( "path/filepath" "strings" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" "github.com/sirupsen/logrus" ) @@ -29,9 +28,8 @@ import ( func NewLDCacheUpdateHook(logger *logrus.Logger, mounts Discover, cfg *Config) (Discover, error) { d := ldconfig{ logger: logger, + nvidiaCTKPath: FindNvidiaCTK(logger, cfg.NvidiaCTKPath), mountsFrom: mounts, - lookup: lookup.NewExecutableLocator(logger, cfg.Root), - nvidiaCTKPath: cfg.NvidiaCTKPath, } return &d, nil @@ -40,9 +38,8 @@ func NewLDCacheUpdateHook(logger *logrus.Logger, mounts Discover, cfg *Config) ( type ldconfig struct { None logger *logrus.Logger - mountsFrom Discover - lookup lookup.Locator nvidiaCTKPath string + mountsFrom Discover } // Hooks checks the required mounts for libraries and returns a hook to update the LDcache for the discovered paths.