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

Merge pull request #181 from mrunalp/fixes 

Fix minor stylistic issues
This commit is contained in:
Michael Crosby 2015-08-04 17:49:33 -04:00
parent a28f627c39 f3a3025933
commit 765fa4a34e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
checkpoint.go
View File

@ -54,13 +54,13 @@ func setPageServer(context *cli.Context, options *libcontainer.CriuOpts) {
if len(addressPort) != 2 {
fatal(fmt.Errorf("Use --page-server ADDRESS:PORT to specify page server"))
}
port_int, err := strconv.Atoi(addressPort[1])
portInt, err := strconv.Atoi(addressPort[1])
if err != nil {
fatal(fmt.Errorf("Invalid port number"))
}
options.PageServer = libcontainer.CriuPageServerInfo{
Address: addressPort[0],
Port: int32(port_int),
Port: int32(portInt),
}
}
}

6
libcontainer/container_linux.go
View File

@ -299,7 +299,7 @@ func (c *linuxContainer) checkCriuVersion() error {
return nil
}
const descriptors_filename = "descriptors.json"
const descriptorsFilename = "descriptors.json"
func (c *linuxContainer) addCriuDumpMount(req *criurpc.CriuReq, m *configs.Mount) {
mountDest := m.Destination
@ -406,7 +406,7 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error {
return err
}
err = ioutil.WriteFile(filepath.Join(criuOpts.ImagesDirectory, descriptors_filename), fdsJSON, 0655)
err = ioutil.WriteFile(filepath.Join(criuOpts.ImagesDirectory, descriptorsFilename), fdsJSON, 0655)
if err != nil {
return err
}
@ -538,7 +538,7 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error {
fdJSON []byte
)
if fdJSON, err = ioutil.ReadFile(filepath.Join(criuOpts.ImagesDirectory, descriptors_filename)); err != nil {
if fdJSON, err = ioutil.ReadFile(filepath.Join(criuOpts.ImagesDirectory, descriptorsFilename)); err != nil {
return err
}

8
spec.go
View File

@ -333,17 +333,17 @@ func setupUserNamespace(spec *specs.LinuxSpec, config *configs.Config) error {
for _, m := range spec.Linux.GIDMappings {
config.GidMappings = append(config.GidMappings, create(m))
}
rootUid, err := config.HostUID()
rootUID, err := config.HostUID()
if err != nil {
return err
}
rootGid, err := config.HostGID()
rootGID, err := config.HostGID()
if err != nil {
return err
}
for _, node := range config.Devices {
node.Uid = uint32(rootUid)
node.Gid = uint32(rootGid)
node.Uid = uint32(rootUID)
node.Gid = uint32(rootGID)
}
return nil
}