From 57834432ade3a2d50eb3d29b14c2aedc3cd3ecf8 Mon Sep 17 00:00:00 2001 From: Gianni Salinetti Date: Mon, 1 May 2017 22:13:29 +0200 Subject: [PATCH 1/6] Updated the path of the ocid binay in the systemd unit file --- tutorial.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorial.md b/tutorial.md index 584e084f..68435e0b 100644 --- a/tutorial.md +++ b/tutorial.md @@ -163,7 +163,7 @@ Description=OCI-based implementation of Kubernetes Container Runtime Interface Documentation=https://github.com/kubernetes-incubator/cri-o [Service] -ExecStart=/usr/bin/ocid --debug +ExecStart=/usr/local/bin/ocid --debug Restart=on-failure RestartSec=5 From 0c912a48d6c56721de6d9e117d97b87f97456ade Mon Sep 17 00:00:00 2001 From: Gianni Salinetti Date: Mon, 1 May 2017 22:19:53 +0200 Subject: [PATCH 2/6] Updated the output of sudo make install command --- tutorial.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tutorial.md b/tutorial.md index 68435e0b..83359826 100644 --- a/tutorial.md +++ b/tutorial.md @@ -129,17 +129,17 @@ sudo make install Output: ``` -install -D -m 755 kpod /usr/bin/kpod -install -D -m 755 ocid /usr/bin/ocid -install -D -m 755 ocic /usr/bin/ocic +install -D -m 755 ocid /usr/local/bin/ocid +install -D -m 755 ocic /usr/local/bin/ocic +install -D -m 755 kpod /usr/local/bin/kpod install -D -m 755 conmon/conmon /usr/local/libexec/ocid/conmon -install -D -m 755 pause/pause /usr/libexec/ocid/pause -install -d -m 755 /usr/share/man/man{1,5,8} -install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/share/man/man1 -install -m 644 docs/ocid.conf.5 -t /usr/share/man/man5 -install -m 644 docs/ocid.8 -t /usr/share/man/man8 -install -D -m 644 ocid.conf /etc/ocid/ocid.conf -install -D -m 644 seccomp.json /etc/ocid/seccomp.json +install -D -m 755 pause/pause /usr/local/libexec/ocid/pause +install -d -m 755 /usr/local/share/man/man1 +install -d -m 755 /usr/local/share/man/man5 +install -d -m 755 /usr/local/share/man/man8 +install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/local/share/man/man1 +install -m 644 docs/ocid.conf.5 -t /usr/local/share/man/man5 +install -m 644 docs/ocid.8 -t /usr/local/share/man/man8 ``` If you are installing for the first time, generate config as follows: From d10f3833430eeb835a79d4d451f6395ab7acf59b Mon Sep 17 00:00:00 2001 From: Gianni Salinetti Date: Mon, 1 May 2017 22:19:53 +0200 Subject: [PATCH 3/6] Updated the output of sudo make install command Signed-off-by: Gianni Salinetti --- tutorial.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tutorial.md b/tutorial.md index 68435e0b..83359826 100644 --- a/tutorial.md +++ b/tutorial.md @@ -129,17 +129,17 @@ sudo make install Output: ``` -install -D -m 755 kpod /usr/bin/kpod -install -D -m 755 ocid /usr/bin/ocid -install -D -m 755 ocic /usr/bin/ocic +install -D -m 755 ocid /usr/local/bin/ocid +install -D -m 755 ocic /usr/local/bin/ocic +install -D -m 755 kpod /usr/local/bin/kpod install -D -m 755 conmon/conmon /usr/local/libexec/ocid/conmon -install -D -m 755 pause/pause /usr/libexec/ocid/pause -install -d -m 755 /usr/share/man/man{1,5,8} -install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/share/man/man1 -install -m 644 docs/ocid.conf.5 -t /usr/share/man/man5 -install -m 644 docs/ocid.8 -t /usr/share/man/man8 -install -D -m 644 ocid.conf /etc/ocid/ocid.conf -install -D -m 644 seccomp.json /etc/ocid/seccomp.json +install -D -m 755 pause/pause /usr/local/libexec/ocid/pause +install -d -m 755 /usr/local/share/man/man1 +install -d -m 755 /usr/local/share/man/man5 +install -d -m 755 /usr/local/share/man/man8 +install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/local/share/man/man1 +install -m 644 docs/ocid.conf.5 -t /usr/local/share/man/man5 +install -m 644 docs/ocid.8 -t /usr/local/share/man/man8 ``` If you are installing for the first time, generate config as follows: From 96810dd876df7a2d456d3b284dca6f3a374c026a Mon Sep 17 00:00:00 2001 From: Gianni Salinetti Date: Tue, 2 May 2017 22:31:03 +0200 Subject: [PATCH 4/6] Revert "Updated the output of sudo make install command" This reverts commit 0c912a48d6c56721de6d9e117d97b87f97456ade. --- tutorial.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tutorial.md b/tutorial.md index 83359826..68435e0b 100644 --- a/tutorial.md +++ b/tutorial.md @@ -129,17 +129,17 @@ sudo make install Output: ``` -install -D -m 755 ocid /usr/local/bin/ocid -install -D -m 755 ocic /usr/local/bin/ocic -install -D -m 755 kpod /usr/local/bin/kpod +install -D -m 755 kpod /usr/bin/kpod +install -D -m 755 ocid /usr/bin/ocid +install -D -m 755 ocic /usr/bin/ocic install -D -m 755 conmon/conmon /usr/local/libexec/ocid/conmon -install -D -m 755 pause/pause /usr/local/libexec/ocid/pause -install -d -m 755 /usr/local/share/man/man1 -install -d -m 755 /usr/local/share/man/man5 -install -d -m 755 /usr/local/share/man/man8 -install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/local/share/man/man1 -install -m 644 docs/ocid.conf.5 -t /usr/local/share/man/man5 -install -m 644 docs/ocid.8 -t /usr/local/share/man/man8 +install -D -m 755 pause/pause /usr/libexec/ocid/pause +install -d -m 755 /usr/share/man/man{1,5,8} +install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/share/man/man1 +install -m 644 docs/ocid.conf.5 -t /usr/share/man/man5 +install -m 644 docs/ocid.8 -t /usr/share/man/man8 +install -D -m 644 ocid.conf /etc/ocid/ocid.conf +install -D -m 644 seccomp.json /etc/ocid/seccomp.json ``` If you are installing for the first time, generate config as follows: From fc928ccb83cf7fa009fcd3a87319bf7fb37ee64a Mon Sep 17 00:00:00 2001 From: Gianni Salinetti Date: Tue, 2 May 2017 22:31:25 +0200 Subject: [PATCH 5/6] Revert "Updated the path of the ocid binay in the systemd unit file" This reverts commit 57834432ade3a2d50eb3d29b14c2aedc3cd3ecf8. --- tutorial.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorial.md b/tutorial.md index 68435e0b..584e084f 100644 --- a/tutorial.md +++ b/tutorial.md @@ -163,7 +163,7 @@ Description=OCI-based implementation of Kubernetes Container Runtime Interface Documentation=https://github.com/kubernetes-incubator/cri-o [Service] -ExecStart=/usr/local/bin/ocid --debug +ExecStart=/usr/bin/ocid --debug Restart=on-failure RestartSec=5 From a9d43f0d2baa25599c4c13cca652d27ca7e4bd34 Mon Sep 17 00:00:00 2001 From: Gianni Salinetti Date: Tue, 2 May 2017 22:35:27 +0200 Subject: [PATCH 6/6] Updated tutorial.md with fixed paths Signed-off-by: Gianni Salinetti --- tutorial.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tutorial.md b/tutorial.md index 584e084f..74011534 100644 --- a/tutorial.md +++ b/tutorial.md @@ -129,15 +129,15 @@ sudo make install Output: ``` -install -D -m 755 kpod /usr/bin/kpod -install -D -m 755 ocid /usr/bin/ocid -install -D -m 755 ocic /usr/bin/ocic +install -D -m 755 kpod /usr/local/bin/kpod +install -D -m 755 ocid /usr/local/bin/ocid +install -D -m 755 ocic /usr/local/bin/ocic install -D -m 755 conmon/conmon /usr/local/libexec/ocid/conmon -install -D -m 755 pause/pause /usr/libexec/ocid/pause -install -d -m 755 /usr/share/man/man{1,5,8} -install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/share/man/man1 -install -m 644 docs/ocid.conf.5 -t /usr/share/man/man5 -install -m 644 docs/ocid.8 -t /usr/share/man/man8 +install -D -m 755 pause/pause /usr/local/libexec/ocid/pause +install -d -m 755 /usr/local/share/man/man{1,5,8} +install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/local/share/man/man1 +install -m 644 docs/ocid.conf.5 -t /usr/local/share/man/man5 +install -m 644 docs/ocid.8 -t /usr/local/share/man/man8 install -D -m 644 ocid.conf /etc/ocid/ocid.conf install -D -m 644 seccomp.json /etc/ocid/seccomp.json ``` @@ -163,7 +163,7 @@ Description=OCI-based implementation of Kubernetes Container Runtime Interface Documentation=https://github.com/kubernetes-incubator/cri-o [Service] -ExecStart=/usr/bin/ocid --debug +ExecStart=/usr/local/bin/ocid --debug Restart=on-failure RestartSec=5