diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-06-27 21:44:07 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-06-27 21:44:07 +0000 |
commit | 91dcb2483b56eeb8083cdff90ed8e8f0a1665d13 (patch) | |
tree | a2752b44b8da8abf49f60cef2a324068503111cb /runsc/specutils | |
parent | 085d6fdce34f34d82de5f71d031407c3da253b23 (diff) | |
parent | 5b41ba5d0eca266790dba5f5dd095010e3944726 (diff) |
Merge 5b41ba5d (automated)
Diffstat (limited to 'runsc/specutils')
-rw-r--r-- | runsc/specutils/fs.go | 2 | ||||
-rw-r--r-- | runsc/specutils/namespace.go | 2 | ||||
-rw-r--r-- | runsc/specutils/specutils.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/runsc/specutils/fs.go b/runsc/specutils/fs.go index 6e6902e9f..138aa4dd1 100644 --- a/runsc/specutils/fs.go +++ b/runsc/specutils/fs.go @@ -87,7 +87,7 @@ func OptionsToFlags(opts []string) uint32 { // PropOptionsToFlags converts propagation mount options to syscall flags. // Propagation options cannot be set other with other options and must be -// handled separatedly. +// handled separately. func PropOptionsToFlags(opts []string) uint32 { return optionsToFlags(opts, propOptionsMap) } diff --git a/runsc/specutils/namespace.go b/runsc/specutils/namespace.go index c9ef606cb..d441419cb 100644 --- a/runsc/specutils/namespace.go +++ b/runsc/specutils/namespace.go @@ -204,7 +204,7 @@ func SetUIDGIDMappings(cmd *exec.Cmd, s *specs.Spec) { } } -// HasCapabilities returns true if the user has all capabilties in 'cs'. +// HasCapabilities returns true if the user has all capabilities in 'cs'. func HasCapabilities(cs ...capability.Cap) bool { caps, err := capability.NewPid2(os.Getpid()) if err != nil { diff --git a/runsc/specutils/specutils.go b/runsc/specutils/specutils.go index 215828120..0b40e38a3 100644 --- a/runsc/specutils/specutils.go +++ b/runsc/specutils/specutils.go @@ -394,7 +394,7 @@ func WaitForReady(pid int, timeout time.Duration, ready func() (bool, error)) er // DebugLogFile opens a log file using 'logPattern' as location. If 'logPattern' // ends with '/', it's used as a directory with default file name. -// 'logPattern' can contain variables that are substitued: +// 'logPattern' can contain variables that are substituted: // - %TIMESTAMP%: is replaced with a timestamp using the following format: // <yyyymmdd-hhmmss.uuuuuu> // - %COMMAND%: is replaced with 'command' |