OSSInnovation
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #963 from guilhermebr/master 

libcontainer: rename keyctl package to keys
This commit is contained in:
Mrunal Patel 2016-07-26 07:34:57 -07:00 committed by GitHub
parent 8033a83975 1cdaa709f1
commit 21124f6274
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcontainer/keys/keyctl.go
View File

@ -1,6 +1,6 @@
// +build linux // +build linux
package keyctl package keys
import ( import (
"fmt" "fmt"

2
libcontainer/setns_init_linux.go
View File

@ -26,7 +26,7 @@ func (l *linuxSetnsInit) getSessionRingName() string {
func (l *linuxSetnsInit) Init() error { func (l *linuxSetnsInit) Init() error {
if !l.config.Config.NoNewKeyring { if !l.config.Config.NoNewKeyring {
// do not inherit the parent's session keyring // do not inherit the parent's session keyring
if _, err := keyctl.JoinSessionKeyring(l.getSessionRingName()); err != nil { if _, err := keys.JoinSessionKeyring(l.getSessionRingName()); err != nil {
return err return err
} }
} }

4
libcontainer/standard_init_linux.go
View File

@ -49,12 +49,12 @@ func (l *linuxStandardInit) Init() error {
ringname, keepperms, newperms := l.getSessionRingParams() ringname, keepperms, newperms := l.getSessionRingParams()
// do not inherit the parent's session keyring // do not inherit the parent's session keyring
sessKeyId, err := keyctl.JoinSessionKeyring(ringname) sessKeyId, err := keys.JoinSessionKeyring(ringname)
if err != nil { if err != nil {
return err return err
} }
// make session keyring searcheable // make session keyring searcheable
if err := keyctl.ModKeyringPerm(sessKeyId, keepperms, newperms); err != nil { if err := keys.ModKeyringPerm(sessKeyId, keepperms, newperms); err != nil {
return err return err
} }
} }