From f638664685f5d3500bf7e29cc8116972054b707e Mon Sep 17 00:00:00 2001
From: Rajat Chopra <rajatc@nvidia.com>
Date: Thu, 11 Jul 2019 18:24:08 -0700
Subject: [PATCH] rename hook to toolkit everywhere

Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
---
 Makefile                                      | 20 ++++++++---------
 base/Makefile                                 |  2 +-
 runtime/debian/control                        |  2 +-
 .../rpm/SPECS/nvidia-container-runtime.spec   |  4 ++--
 {hook => toolkit}/Dockerfile.amzn             | 12 +++++-----
 {hook => toolkit}/Dockerfile.centos           | 12 +++++-----
 {hook => toolkit}/Dockerfile.debian           | 12 +++++-----
 {hook => toolkit}/Dockerfile.ubuntu           | 10 ++++-----
 {hook => toolkit}/Makefile                    | 22 +++++++++----------
 {hook => toolkit}/config.toml.amzn            |  2 +-
 {hook => toolkit}/config.toml.centos          |  2 +-
 {hook => toolkit}/config.toml.debian          |  2 +-
 {hook => toolkit}/config.toml.ubuntu          |  2 +-
 toolkit/debian/changelog                      |  5 +++++
 .../changelog => toolkit/debian/changelog.old |  0
 {hook => toolkit}/debian/compat               |  0
 {hook => toolkit}/debian/control              |  4 ++--
 {hook => toolkit}/debian/copyright            |  2 +-
 .../nvidia-container-runtime-toolkit.install  |  2 +-
 ...ontainer-runtime-toolkit.lintian-overrides |  0
 {hook => toolkit}/debian/prepare              |  0
 {hook => toolkit}/debian/rules                |  0
 .../Godeps/Godeps.json                        |  2 +-
 .../nvidia-container-toolkit}/capabilities.go |  0
 .../container_config.go                       |  0
 .../nvidia-container-toolkit}/hook_config.go  |  0
 .../nvidia-container-toolkit}/hook_test.go    |  0
 .../nvidia-container-toolkit}/main.go         |  0
 .../github.com/BurntSushi/toml/.gitignore     |  0
 .../github.com/BurntSushi/toml/.travis.yml    |  0
 .../github.com/BurntSushi/toml/COMPATIBLE     |  0
 .../vendor/github.com/BurntSushi/toml/COPYING |  0
 .../github.com/BurntSushi/toml/Makefile       |  0
 .../github.com/BurntSushi/toml/README.md      |  0
 .../github.com/BurntSushi/toml/decode.go      |  0
 .../github.com/BurntSushi/toml/decode_meta.go |  0
 .../vendor/github.com/BurntSushi/toml/doc.go  |  0
 .../github.com/BurntSushi/toml/encode.go      |  0
 .../BurntSushi/toml/encoding_types.go         |  0
 .../BurntSushi/toml/encoding_types_1.1.go     |  0
 .../vendor/github.com/BurntSushi/toml/lex.go  |  0
 .../github.com/BurntSushi/toml/parse.go       |  0
 .../github.com/BurntSushi/toml/session.vim    |  0
 .../github.com/BurntSushi/toml/type_check.go  |  0
 .../github.com/BurntSushi/toml/type_fields.go |  0
 {hook => toolkit}/oci-nvidia-hook             |  2 +-
 {hook => toolkit}/oci-nvidia-hook.json        |  4 ++--
 {hook => toolkit}/rpm/SOURCES/LICENSE         |  0
 .../rpm/SPECS/nvidia-container-toolkit.spec   |  8 +++----
 49 files changed, 69 insertions(+), 64 deletions(-)
 rename {hook => toolkit}/Dockerfile.amzn (71%)
 rename {hook => toolkit}/Dockerfile.centos (68%)
 rename {hook => toolkit}/Dockerfile.debian (66%)
 rename {hook => toolkit}/Dockerfile.ubuntu (65%)
 rename {hook => toolkit}/Makefile (71%)
 rename {hook => toolkit}/config.toml.amzn (84%)
 rename {hook => toolkit}/config.toml.centos (84%)
 rename {hook => toolkit}/config.toml.debian (84%)
 rename {hook => toolkit}/config.toml.ubuntu (84%)
 create mode 100644 toolkit/debian/changelog
 rename hook/debian/changelog => toolkit/debian/changelog.old (100%)
 rename {hook => toolkit}/debian/compat (100%)
 rename {hook => toolkit}/debian/control (89%)
 rename {hook => toolkit}/debian/copyright (97%)
 rename hook/debian/nvidia-container-runtime-hook.install => toolkit/debian/nvidia-container-runtime-toolkit.install (52%)
 rename hook/debian/nvidia-container-runtime-hook.lintian-overrides => toolkit/debian/nvidia-container-runtime-toolkit.lintian-overrides (100%)
 rename {hook => toolkit}/debian/prepare (100%)
 rename {hook => toolkit}/debian/rules (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/Godeps/Godeps.json (68%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/capabilities.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/container_config.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/hook_config.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/hook_test.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/main.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/.gitignore (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/.travis.yml (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/COMPATIBLE (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/COPYING (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/Makefile (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/README.md (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/decode.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/decode_meta.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/doc.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/encode.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/encoding_types.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/lex.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/parse.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/session.vim (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/type_check.go (100%)
 rename {hook/nvidia-container-runtime-hook => toolkit/nvidia-container-toolkit}/vendor/github.com/BurntSushi/toml/type_fields.go (100%)
 rename {hook => toolkit}/oci-nvidia-hook (58%)
 rename {hook => toolkit}/oci-nvidia-hook.json (67%)
 rename {hook => toolkit}/rpm/SOURCES/LICENSE (100%)
 rename hook/rpm/SPECS/nvidia-container-runtime-hook.spec => toolkit/rpm/SPECS/nvidia-container-toolkit.spec (86%)

diff --git a/Makefile b/Makefile
index 457c905..b59d09e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,27 +7,27 @@ all: ubuntu18.04 ubuntu16.04 debian9 centos7 amzn2 amzn1
 runtime: runtime-ubuntu18.04 runtime-ubuntu16.04 runtime-debian9 runtime-centos7 runtime-amzn2 runtime-amzn1
 
 # Build all packages for a specific distribution.
-ubuntu18.04: runtime-ubuntu18.04 hook-ubuntu18.04
+ubuntu18.04: runtime-ubuntu18.04 toolkit-ubuntu18.04
 
-ubuntu16.04: runtime-ubuntu16.04 hook-ubuntu16.04
+ubuntu16.04: runtime-ubuntu16.04 toolkit-ubuntu16.04
 
-ubuntu14.04: runtime-ubuntu14.04 hook-ubuntu14.04
+ubuntu14.04: runtime-ubuntu14.04 toolkit-ubuntu14.04
 
-debian9: runtime-debian9 hook-debian9
+debian9: runtime-debian9 toolkit-debian9
 
-debian8: runtime-debian8 hook-debian8
+debian8: runtime-debian8 toolkit-debian8
 
-centos7: runtime-centos7 hook-centos7
+centos7: runtime-centos7 toolkit-centos7
 
-amzn2: runtime-amzn2 hook-amzn2
+amzn2: runtime-amzn2 toolkit-amzn2
 
-amzn1: runtime-amzn1 hook-amzn1
+amzn1: runtime-amzn1 toolkit-amzn1
 
 base-%:
 	make -C $(CURDIR)/base $*
 
-hook-%: base-%
-	make -C $(CURDIR)/hook $*
+toolkit-%: base-%
+	make -C $(CURDIR)/toolkit $*
 
 runtime-%: base-%
 	make -C $(CURDIR)/runtime $*
diff --git a/base/Makefile b/base/Makefile
index 2d9a90f..4c40dd2 100644
--- a/base/Makefile
+++ b/base/Makefile
@@ -7,7 +7,7 @@ GOLANG_VERSION := 1.10.3
 .NOTPARALLEL:
 .PHONY: all
 
-all: ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
+all: ubuntu18.04 ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
 
 ubuntu%: $(CURDIR)/Dockerfile.ubuntu
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
diff --git a/runtime/debian/control b/runtime/debian/control
index 9c3cfce..c061ba8 100644
--- a/runtime/debian/control
+++ b/runtime/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9)
 
 Package: nvidia-container-runtime
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-runtime-hook (<< 2.0.0), libseccomp2
+Depends: ${shlibs:Depends}, ${misc:Depends}, nvidia-container-toolkit (<< 2.0.0), libseccomp2
 Description: NVIDIA container runtime
  Provides a modified version of runc allowing users to run GPU enabled
  containers.
diff --git a/runtime/rpm/SPECS/nvidia-container-runtime.spec b/runtime/rpm/SPECS/nvidia-container-runtime.spec
index 65cfd6a..31a8f4a 100644
--- a/runtime/rpm/SPECS/nvidia-container-runtime.spec
+++ b/runtime/rpm/SPECS/nvidia-container-runtime.spec
@@ -14,8 +14,8 @@ License: ASL 2.0
 Source0: nvidia-container-runtime
 Source1: LICENSE
 
-Obsoletes: nvidia-container-runtime < 3.0.0
-Requires: nvidia-container-runtime-hook < 2.0.0
+Obsoletes: nvidia-container-runtime < 2.0.0
+Requires: nvidia-container-toolkit < 2.0.0
 Requires: libseccomp
 
 %description
diff --git a/hook/Dockerfile.amzn b/toolkit/Dockerfile.amzn
similarity index 71%
rename from hook/Dockerfile.amzn
rename to toolkit/Dockerfile.amzn
index 6d48382..96294cf 100644
--- a/hook/Dockerfile.amzn
+++ b/toolkit/Dockerfile.amzn
@@ -9,14 +9,14 @@ ENV VERSION $PKG_VERS
 ENV RELEASE $PKG_REV
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS/SOURCES
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS/SOURCES
 RUN mkdir -p $DIST_DIR
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.amzn $DIST_DIR/config.toml
 
@@ -36,5 +36,5 @@ CMD arch=$(uname -m) && \
              -D "_topdir $PWD" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
-             SPECS/nvidia-container-runtime-hook.spec && \
+             SPECS/nvidia-container-toolkit.spec && \
     mv RPMS/$arch/*.rpm /dist
diff --git a/hook/Dockerfile.centos b/toolkit/Dockerfile.centos
similarity index 68%
rename from hook/Dockerfile.centos
rename to toolkit/Dockerfile.centos
index 3f468e1..14cef56 100644
--- a/hook/Dockerfile.centos
+++ b/toolkit/Dockerfile.centos
@@ -9,14 +9,14 @@ ENV VERSION $PKG_VERS
 ENV RELEASE $PKG_REV
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS/SOURCES
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS/SOURCES
 RUN mkdir -p $DIST_DIR /dist
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.centos $DIST_DIR/config.toml
 
@@ -34,5 +34,5 @@ CMD arch=$(uname -m) && \
              -D "_topdir $PWD" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
-             SPECS/nvidia-container-runtime-hook.spec && \
+             SPECS/nvidia-container-toolkit.spec && \
     mv RPMS/$arch/*.rpm /dist
diff --git a/hook/Dockerfile.debian b/toolkit/Dockerfile.debian
similarity index 66%
rename from hook/Dockerfile.debian
rename to toolkit/Dockerfile.debian
index 5b070fb..e68eb3d 100644
--- a/hook/Dockerfile.debian
+++ b/toolkit/Dockerfile.debian
@@ -11,14 +11,14 @@ ENV REVISION "$PKG_VERS-$PKG_REV"
 ENV SECTION ""
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS
 RUN mkdir -p $DIST_DIR /dist
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.debian $DIST_DIR/config.toml
 
@@ -34,4 +34,4 @@ RUN if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then ex
 
 CMD export DISTRIB="unstable" && \
     debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
-    mv /tmp/nvidia-container-runtime-hook_*.deb /dist
+    mv /tmp/nvidia-container-toolkit_*.deb /dist
diff --git a/hook/Dockerfile.ubuntu b/toolkit/Dockerfile.ubuntu
similarity index 65%
rename from hook/Dockerfile.ubuntu
rename to toolkit/Dockerfile.ubuntu
index 1c0445e..a3b53b1 100644
--- a/hook/Dockerfile.ubuntu
+++ b/toolkit/Dockerfile.ubuntu
@@ -11,14 +11,14 @@ ENV REVISION "$PKG_VERS-$PKG_REV"
 ENV SECTION ""
 
 # output directory
-ENV DIST_DIR=/tmp/nvidia-container-runtime-hook-$PKG_VERS
+ENV DIST_DIR=/tmp/nvidia-container-toolkit-$PKG_VERS
 RUN mkdir -p $DIST_DIR /dist
 
-# nvidia-container-runtime-hook
-COPY nvidia-container-runtime-hook/ $GOPATH/src/nvidia-container-runtime-hook
+# nvidia-container-toolkit
+COPY nvidia-container-toolkit/ $GOPATH/src/nvidia-container-toolkit
 
-RUN go get -ldflags "-s -w" -v nvidia-container-runtime-hook && \
-    mv $GOPATH/bin/nvidia-container-runtime-hook $DIST_DIR/nvidia-container-runtime-hook
+RUN go get -ldflags "-s -w" -v nvidia-container-toolkit && \
+    mv $GOPATH/bin/nvidia-container-toolkit $DIST_DIR/nvidia-container-toolkit
 
 COPY config.toml.ubuntu $DIST_DIR/config.toml
 
diff --git a/hook/Makefile b/toolkit/Makefile
similarity index 71%
rename from hook/Makefile
rename to toolkit/Makefile
index 0c78739..8756ff6 100644
--- a/hook/Makefile
+++ b/toolkit/Makefile
@@ -2,25 +2,25 @@
 
 DOCKER ?= docker
 
-MKDIR  ?= mkdir
+MKDIR ?= mkdir
 
-VERSION := 1.4.0
+VERSION := 1.0.0
 
 DIST_DIR  := $(CURDIR)/../dist
 
 .NOTPARALLEL:
 .PHONY: all
 
-all: ubuntu18.04 ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
+all: ubuntu18.04 ubuntu16.04 debian9 centos7 amzn2 amzn1
 
 ubuntu%: ARCH := amd64
 ubuntu%: $(CURDIR)/Dockerfile.ubuntu
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="1" \
-	                -t "nvidia/hook/ubuntu:$*" -f Dockerfile.ubuntu .
+	                -t "nvidia/toolkit/ubuntu:$*" -f Dockerfile.ubuntu .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/ubuntu:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/ubuntu:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -29,9 +29,9 @@ debian%: $(CURDIR)/Dockerfile.debian
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="1" \
-	                -t "nvidia/hook/debian:$*" -f Dockerfile.debian .
+	                -t "nvidia/toolkit/debian:$*" -f Dockerfile.debian .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/debian:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/debian:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -40,9 +40,9 @@ centos%: $(CURDIR)/Dockerfile.centos
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="2" \
-	                -t "nvidia/hook/centos:$*" -f Dockerfile.centos .
+	                -t "nvidia/toolkit/centos:$*" -f Dockerfile.centos .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/centos:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/centos:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -51,8 +51,8 @@ amzn%: $(CURDIR)/Dockerfile.amzn
 	$(DOCKER) build --build-arg VERSION_ID="$*" \
 	                --build-arg PKG_VERS="$(VERSION)" \
 	                --build-arg PKG_REV="2.amzn$*" \
-	                -t "nvidia/hook/amzn:$*" -f Dockerfile.amzn .
+	                -t "nvidia/toolkit/amzn:$*" -f Dockerfile.amzn .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "nvidia/hook/amzn:$*"
+	$(DOCKER) run --cidfile $@.cid "nvidia/toolkit/amzn:$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
diff --git a/hook/config.toml.amzn b/toolkit/config.toml.amzn
similarity index 84%
rename from hook/config.toml.amzn
rename to toolkit/config.toml.amzn
index c891a55..82c56b3 100644
--- a/hook/config.toml.amzn
+++ b/toolkit/config.toml.amzn
@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false
diff --git a/hook/config.toml.centos b/toolkit/config.toml.centos
similarity index 84%
rename from hook/config.toml.centos
rename to toolkit/config.toml.centos
index c891a55..82c56b3 100644
--- a/hook/config.toml.centos
+++ b/toolkit/config.toml.centos
@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false
diff --git a/hook/config.toml.debian b/toolkit/config.toml.debian
similarity index 84%
rename from hook/config.toml.debian
rename to toolkit/config.toml.debian
index c891a55..82c56b3 100644
--- a/hook/config.toml.debian
+++ b/toolkit/config.toml.debian
@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false
diff --git a/hook/config.toml.ubuntu b/toolkit/config.toml.ubuntu
similarity index 84%
rename from hook/config.toml.ubuntu
rename to toolkit/config.toml.ubuntu
index d3e54db..ce16466 100644
--- a/hook/config.toml.ubuntu
+++ b/toolkit/config.toml.ubuntu
@@ -5,7 +5,7 @@ disable-require = false
 #root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
-#debug = "/var/log/nvidia-container-runtime-hook.log"
+#debug = "/var/log/nvidia-container-toolkit.log"
 #ldcache = "/etc/ld.so.cache"
 load-kmods = true
 #no-cgroups = false
diff --git a/toolkit/debian/changelog b/toolkit/debian/changelog
new file mode 100644
index 0000000..1171f78
--- /dev/null
+++ b/toolkit/debian/changelog
@@ -0,0 +1,5 @@
+nvidia-container-toolkit (1.0.0-1) UNRELEASED; urgency=medium
+
+  * Initial release. Replaces older package nvidia-container-runtime-hook. (Closes: #XXXXXX)
+
+ -- Rajat Chopra <rajatc@nvidia.com>  Wed, 10 Jul 2019 11:31:11 -0700
diff --git a/hook/debian/changelog b/toolkit/debian/changelog.old
similarity index 100%
rename from hook/debian/changelog
rename to toolkit/debian/changelog.old
diff --git a/hook/debian/compat b/toolkit/debian/compat
similarity index 100%
rename from hook/debian/compat
rename to toolkit/debian/compat
diff --git a/hook/debian/control b/toolkit/debian/control
similarity index 89%
rename from hook/debian/control
rename to toolkit/debian/control
index ef2f836..665e1f6 100644
--- a/hook/debian/control
+++ b/toolkit/debian/control
@@ -1,4 +1,4 @@
-Source: nvidia-container-runtime-hook
+Source: nvidia-container-toolkit
 Section: @SECTION@utils
 Priority: optional
 Maintainer: NVIDIA CORPORATION <cudatools@nvidia.com>
@@ -8,7 +8,7 @@ Vcs-Git: https://github.com/NVIDIA/nvidia-container-runtime
 Vcs-Browser: https://github.com/NVIDIA/nvidia-container-runtime
 Build-Depends: debhelper (>= 9)
 
-Package: nvidia-container-runtime-hook
+Package: nvidia-container-toolkit
 Architecture: any
 Depends: ${misc:Depends}, libnvidia-container-tools (>= 0.1.0), libnvidia-container-tools (<< 2.0.0)
 Breaks: nvidia-container-runtime (<< 2.0.0)
diff --git a/hook/debian/copyright b/toolkit/debian/copyright
similarity index 97%
rename from hook/debian/copyright
rename to toolkit/debian/copyright
index 67e33d5..0e0e9d2 100644
--- a/hook/debian/copyright
+++ b/toolkit/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: nvidia-container-runtime-hook
+Upstream-Name: nvidia-container-toolkit
 Source: https://github.com/NVIDIA/nvidia-container-runtime
 
 Files: *
diff --git a/hook/debian/nvidia-container-runtime-hook.install b/toolkit/debian/nvidia-container-runtime-toolkit.install
similarity index 52%
rename from hook/debian/nvidia-container-runtime-hook.install
rename to toolkit/debian/nvidia-container-runtime-toolkit.install
index 4bcfe09..6975c4b 100644
--- a/hook/debian/nvidia-container-runtime-hook.install
+++ b/toolkit/debian/nvidia-container-runtime-toolkit.install
@@ -1,2 +1,2 @@
 config.toml /etc/nvidia-container-runtime
-nvidia-container-runtime-hook /usr/bin
\ No newline at end of file
+nvidia-container-toolkit /usr/bin
diff --git a/hook/debian/nvidia-container-runtime-hook.lintian-overrides b/toolkit/debian/nvidia-container-runtime-toolkit.lintian-overrides
similarity index 100%
rename from hook/debian/nvidia-container-runtime-hook.lintian-overrides
rename to toolkit/debian/nvidia-container-runtime-toolkit.lintian-overrides
diff --git a/hook/debian/prepare b/toolkit/debian/prepare
similarity index 100%
rename from hook/debian/prepare
rename to toolkit/debian/prepare
diff --git a/hook/debian/rules b/toolkit/debian/rules
similarity index 100%
rename from hook/debian/rules
rename to toolkit/debian/rules
diff --git a/hook/nvidia-container-runtime-hook/Godeps/Godeps.json b/toolkit/nvidia-container-toolkit/Godeps/Godeps.json
similarity index 68%
rename from hook/nvidia-container-runtime-hook/Godeps/Godeps.json
rename to toolkit/nvidia-container-toolkit/Godeps/Godeps.json
index 9db8121..e6db9bf 100644
--- a/hook/nvidia-container-runtime-hook/Godeps/Godeps.json
+++ b/toolkit/nvidia-container-toolkit/Godeps/Godeps.json
@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/nvidia/nvidia-container-runtime/hook/nvidia-container-runtime-hook",
+	"ImportPath": "github.com/nvidia/nvidia-container-runtime/toolkit/nvidia-container-toolkit",
 	"GoVersion": "go1.9",
 	"GodepVersion": "v80",
 	"Deps": [
diff --git a/hook/nvidia-container-runtime-hook/capabilities.go b/toolkit/nvidia-container-toolkit/capabilities.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/capabilities.go
rename to toolkit/nvidia-container-toolkit/capabilities.go
diff --git a/hook/nvidia-container-runtime-hook/container_config.go b/toolkit/nvidia-container-toolkit/container_config.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/container_config.go
rename to toolkit/nvidia-container-toolkit/container_config.go
diff --git a/hook/nvidia-container-runtime-hook/hook_config.go b/toolkit/nvidia-container-toolkit/hook_config.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/hook_config.go
rename to toolkit/nvidia-container-toolkit/hook_config.go
diff --git a/hook/nvidia-container-runtime-hook/hook_test.go b/toolkit/nvidia-container-toolkit/hook_test.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/hook_test.go
rename to toolkit/nvidia-container-toolkit/hook_test.go
diff --git a/hook/nvidia-container-runtime-hook/main.go b/toolkit/nvidia-container-toolkit/main.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/main.go
rename to toolkit/nvidia-container-toolkit/main.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/.gitignore b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/.gitignore
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/.gitignore
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/.gitignore
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/.travis.yml b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/.travis.yml
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/.travis.yml
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/.travis.yml
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/COMPATIBLE b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/COMPATIBLE
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/COMPATIBLE
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/COMPATIBLE
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/COPYING b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/COPYING
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/COPYING
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/COPYING
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/Makefile b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/Makefile
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/Makefile
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/Makefile
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/README.md b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/README.md
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/README.md
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/README.md
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/decode.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/decode.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/decode.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/decode.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/decode_meta.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/decode_meta.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/decode_meta.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/decode_meta.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/doc.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/doc.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/doc.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/doc.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/encode.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/encode.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/encode.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/encode.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/encoding_types.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/encoding_types.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/encoding_types.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/encoding_types.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/lex.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/lex.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/lex.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/lex.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/parse.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/parse.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/parse.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/parse.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/session.vim b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/session.vim
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/session.vim
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/session.vim
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/type_check.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/type_check.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/type_check.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/type_check.go
diff --git a/hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/type_fields.go b/toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/type_fields.go
similarity index 100%
rename from hook/nvidia-container-runtime-hook/vendor/github.com/BurntSushi/toml/type_fields.go
rename to toolkit/nvidia-container-toolkit/vendor/github.com/BurntSushi/toml/type_fields.go
diff --git a/hook/oci-nvidia-hook b/toolkit/oci-nvidia-hook
similarity index 58%
rename from hook/oci-nvidia-hook
rename to toolkit/oci-nvidia-hook
index 5e8f3b7..b00c298 100755
--- a/hook/oci-nvidia-hook
+++ b/toolkit/oci-nvidia-hook
@@ -1,2 +1,2 @@
 #!/bin/sh
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" exec /usr/bin/nvidia-container-runtime-hook "$@"
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" exec /usr/bin/nvidia-container-toolkit "$@"
diff --git a/hook/oci-nvidia-hook.json b/toolkit/oci-nvidia-hook.json
similarity index 67%
rename from hook/oci-nvidia-hook.json
rename to toolkit/oci-nvidia-hook.json
index 6cbbe5c..5c79b6d 100644
--- a/hook/oci-nvidia-hook.json
+++ b/toolkit/oci-nvidia-hook.json
@@ -1,8 +1,8 @@
 {
     "version": "1.0.0",
     "hook": {
-        "path": "/usr/bin/nvidia-container-runtime-hook",
-        "args": ["nvidia-container-runtime-hook", "prestart"],
+        "path": "/usr/bin/nvidia-container-toolkit",
+        "args": ["nvidia-container-toolkit", "prestart"],
         "env": [
             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
         ]
diff --git a/hook/rpm/SOURCES/LICENSE b/toolkit/rpm/SOURCES/LICENSE
similarity index 100%
rename from hook/rpm/SOURCES/LICENSE
rename to toolkit/rpm/SOURCES/LICENSE
diff --git a/hook/rpm/SPECS/nvidia-container-runtime-hook.spec b/toolkit/rpm/SPECS/nvidia-container-toolkit.spec
similarity index 86%
rename from hook/rpm/SPECS/nvidia-container-runtime-hook.spec
rename to toolkit/rpm/SPECS/nvidia-container-toolkit.spec
index a26f48b..d8a9736 100644
--- a/hook/rpm/SPECS/nvidia-container-runtime-hook.spec
+++ b/toolkit/rpm/SPECS/nvidia-container-toolkit.spec
@@ -1,4 +1,4 @@
-Name: nvidia-container-runtime-hook
+Name: nvidia-container-toolkit
 Version: %{version}
 Release: %{release}
 Group: Development Tools
@@ -10,7 +10,7 @@ Summary: NVIDIA container runtime hook
 URL: https://github.com/NVIDIA/nvidia-container-runtime
 License: BSD
 
-Source0: nvidia-container-runtime-hook
+Source0: nvidia-container-toolkit
 Source1: config.toml
 Source2: oci-nvidia-hook
 Source3: oci-nvidia-hook.json
@@ -27,7 +27,7 @@ cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 
 %install
 mkdir -p %{buildroot}%{_bindir}
-install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime-hook
+install -m 755 -t %{buildroot}%{_bindir} nvidia-container-toolkit
 
 mkdir -p %{buildroot}/etc/nvidia-container-runtime
 install -m 644 -t %{buildroot}/etc/nvidia-container-runtime config.toml
@@ -40,7 +40,7 @@ install -m 644 -t %{buildroot}/usr/share/containers/oci/hooks.d oci-nvidia-hook.
 
 %files
 %license LICENSE
-%{_bindir}/nvidia-container-runtime-hook
+%{_bindir}/nvidia-container-toolkit
 /etc/nvidia-container-runtime/config.toml
 /usr/libexec/oci/hooks.d/oci-nvidia-hook
 /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
-- 
GitLab