Merge pull request #846 from Random-Liu/cherrypick-#843-to-1.10

Cherrypick #843 to release/1.0
containerd · Jul 13, 2018 · 2cc44d9 · 2cc44d9
2 parents 1895a01 + ae93222
commit 2cc44d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/installation.md b/docs/installation.md
@@ -85,7 +85,7 @@ curl https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERS
 ## Step 2: Install Containerd
 If you are using systemd, just simply unpack the tarball to the root directory:
 ```bash
-sudo tar -C / -xzf cri-containerd-${VERSION}.linux-amd64.tar.gz
+sudo tar --no-overwrite-dir -C / -xzf cri-containerd-${VERSION}.linux-amd64.tar.gz
 sudo systemctl start containerd
 ```
 If you are not using systemd, please unpack all binaries into a directory in your `PATH`, and start `containerd` as monitored long running services with the service manager you are using e.g. `supervisord`, `upstart` etc.

diff --git a/hack/release.sh b/hack/release.sh
@@ -21,6 +21,8 @@ set -o pipefail
 source $(dirname "${BASH_SOURCE[0]}")/utils.sh
 cd ${ROOT}
 
+umask 0022
+
 # BUILD_DIR is the directory to generate release tar.
 # TARBALL is the name of the release tar.
 BUILD_DIR=${BUILD_DIR:-"_output"}