Bump init and containerd package to v1.0.0-beta.1

golint on pkg/init now complains:

    golint...
    ./init.go:199:2: redundant if ...; err != nil check, just return error instead.

Resulting in a change which doesn't seem like an improvement to me.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2017-09-25 13:31:12 +01:00
parent fb94b23a93
commit 09c89a923b
4 changed files with 4 additions and 8 deletions

View File

@@ -196,11 +196,7 @@ func copyFS(newRoot string) error {
}
// chdir to "/" to fix up . and ..
if err := os.Chdir("/"); err != nil {
return err
}
return nil
return os.Chdir("/")
}
func main() {