kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

fix typos in daemon_unix.go

Browse source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud 2016-03-24 23:57:11 +08:00
parent 57575a2695
commit 25c9bd81f6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/daemon_unix.go
View file

@ -587,7 +587,7 @@ func configureMaxThreads(config *Config) error {
return nil return nil
} }
// configureKernelSecuritySupport configures and validate security support for the kernel // configureKernelSecuritySupport configures and validates security support for the kernel
func configureKernelSecuritySupport(config *Config, driverName string) error { func configureKernelSecuritySupport(config *Config, driverName string) error {
if config.EnableSelinuxSupport { if config.EnableSelinuxSupport {
if selinuxEnabled() { if selinuxEnabled() {
@ -899,7 +899,7 @@ func parseRemappedRoot(usergrp string) (string, string, error) {
if len(idparts) == 2 { if len(idparts) == 2 {
// groupname or gid is separately specified and must be resolved // groupname or gid is separately specified and must be resolved
// to a unsigned 32-bit gid // to an unsigned 32-bit gid
if gid, err := strconv.ParseInt(idparts[1], 10, 32); err == nil { if gid, err := strconv.ParseInt(idparts[1], 10, 32); err == nil {
// must be a gid, take it as valid // must be a gid, take it as valid
groupID = int(gid) groupID = int(gid)
@ -979,7 +979,7 @@ func setupDaemonRoot(config *Config, rootDir string, rootUID, rootGID int) error
if config.RemappedRoot != "" { if config.RemappedRoot != "" {
config.Root = filepath.Join(rootDir, fmt.Sprintf("%d.%d", rootUID, rootGID)) config.Root = filepath.Join(rootDir, fmt.Sprintf("%d.%d", rootUID, rootGID))
logrus.Debugf("Creating user namespaced daemon root: %s", config.Root) logrus.Debugf("Creating user namespaced daemon root: %s", config.Root)
// Create the root directory if it doesn't exists // Create the root directory if it doesn't exist
if err := idtools.MkdirAllAs(config.Root, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAs(config.Root, 0700, rootUID, rootGID); err != nil {
return fmt.Errorf("Cannot create daemon root: %s: %v", config.Root, err) return fmt.Errorf("Cannot create daemon root: %s: %v", config.Root, err)
} }
@ -1092,7 +1092,7 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {
return s, nil return s, nil
} }
// setDefaultIsolation determine the default isolation mode for the // setDefaultIsolation determines the default isolation mode for the
// daemon to run in. This is only applicable on Windows // daemon to run in. This is only applicable on Windows
func (daemon *Daemon) setDefaultIsolation() error { func (daemon *Daemon) setDefaultIsolation() error {
return nil return nil