diff --git a/cmd/nvidia-ctk/hook/hook.go b/cmd/nvidia-ctk/hook/hook.go index a81f6d65..8fc403ae 100644 --- a/cmd/nvidia-ctk/hook/hook.go +++ b/cmd/nvidia-ctk/hook/hook.go @@ -18,7 +18,7 @@ package hook import ( chmod "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/hook/chmod" - devchar "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/hook/create-dev-char-symlinks" + symlinks "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/hook/create-symlinks" ldcache "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/hook/update-ldcache" "github.com/sirupsen/logrus" @@ -49,7 +49,6 @@ func (m hookCommand) build() *cli.Command { ldcache.NewCommand(m.logger), symlinks.NewCommand(m.logger), chmod.NewCommand(m.logger), - devchar.NewCommand(m.logger), } return &hook diff --git a/cmd/nvidia-ctk/hook/create-dev-char-symlinks/all.go b/cmd/nvidia-ctk/system/create-dev-char-symlinks/all.go similarity index 100% rename from cmd/nvidia-ctk/hook/create-dev-char-symlinks/all.go rename to cmd/nvidia-ctk/system/create-dev-char-symlinks/all.go diff --git a/cmd/nvidia-ctk/hook/create-dev-char-symlinks/create-dev-char-symlinks.go b/cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go similarity index 98% rename from cmd/nvidia-ctk/hook/create-dev-char-symlinks/create-dev-char-symlinks.go rename to cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go index bec0314e..f84734b3 100644 --- a/cmd/nvidia-ctk/hook/create-dev-char-symlinks/create-dev-char-symlinks.go +++ b/cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go @@ -45,7 +45,7 @@ type config struct { createAll bool } -// NewCommand constructs a hook sub-command with the specified logger +// NewCommand constructs a command sub-command with the specified logger func NewCommand(logger *logrus.Logger) *cli.Command { c := command{ logger: logger, @@ -60,7 +60,7 @@ func (m command) build() *cli.Command { // Create the 'create-dev-char-symlinks' command c := cli.Command{ Name: "create-dev-char-symlinks", - Usage: "A hook to create symlinks to possible /dev/nv* devices in /dev/char", + Usage: "A utility to create symlinks to possible /dev/nv* devices in /dev/char", Before: func(c *cli.Context) error { return m.validateFlags(c, &cfg) }, diff --git a/cmd/nvidia-ctk/hook/create-dev-char-symlinks/existing.go b/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go similarity index 100% rename from cmd/nvidia-ctk/hook/create-dev-char-symlinks/existing.go rename to cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go diff --git a/cmd/nvidia-ctk/system/system.go b/cmd/nvidia-ctk/system/system.go index 721a2940..a9f2e2ea 100644 --- a/cmd/nvidia-ctk/system/system.go +++ b/cmd/nvidia-ctk/system/system.go @@ -17,7 +17,7 @@ package system import ( - "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/runtime/configure" + devchar "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) @@ -42,7 +42,7 @@ func (m command) build() *cli.Command { } system.Subcommands = []*cli.Command{ - configure.NewCommand(m.logger), + devchar.NewCommand(m.logger), } return &system