Skip to content

Commit ee992e5

Browse files
authored
Merge pull request #1108 from dqminh/misspell
fix typos with misspell
2 parents 8d505cb + 1b876b0 commit ee992e5

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

libcontainer/cgroups/fs/apply_raw.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ func (raw *cgroupData) path(subsystem string) (string, error) {
295295

296296
// If the cgroup name/path is absolute do not look relative to the cgroup of the init process.
297297
if filepath.IsAbs(raw.innerPath) {
298-
// Sometimes subsystems can be mounted togethger as 'cpu,cpuacct'.
298+
// Sometimes subsystems can be mounted together as 'cpu,cpuacct'.
299299
return filepath.Join(raw.root, filepath.Base(mnt), raw.innerPath), nil
300300
}
301301

libcontainer/cgroups/systemd/apply_systemd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func joinCgroups(c *configs.Cgroup, pid int) error {
388388
return nil
389389
}
390390

391-
// systemd represents slice heirarchy using `-`, so we need to follow suit when
391+
// systemd represents slice hierarchy using `-`, so we need to follow suit when
392392
// generating the path of slice. Essentially, test-a-b.slice becomes
393393
// test.slice/test-a.slice/test-a-b.slice.
394394
func ExpandSlice(slice string) (string, error) {

libcontainer/configs/cgroup_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type Cgroup struct {
2222
// The path is assumed to be relative to the host system cgroup mountpoint.
2323
Path string `json:"path"`
2424

25-
// ScopePrefix decribes prefix for the scope name
25+
// ScopePrefix describes prefix for the scope name
2626
ScopePrefix string `json:"scope_prefix"`
2727

2828
// Paths represent the absolute cgroups paths to join.
@@ -95,7 +95,7 @@ type Resources struct {
9595
// IO read rate limit per cgroup per device, bytes per second.
9696
BlkioThrottleReadBpsDevice []*ThrottleDevice `json:"blkio_throttle_read_bps_device"`
9797

98-
// IO write rate limit per cgroup per divice, bytes per second.
98+
// IO write rate limit per cgroup per device, bytes per second.
9999
BlkioThrottleWriteBpsDevice []*ThrottleDevice `json:"blkio_throttle_write_bps_device"`
100100

101101
// IO read rate limit per cgroup per device, IO per second.

libcontainer/console_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func newConsoleFromPath(slavePath string) *linuxConsole {
4444
}
4545
}
4646

47-
// linuxConsole is a linux psuedo TTY for use within a container.
47+
// linuxConsole is a linux pseudo TTY for use within a container.
4848
type linuxConsole struct {
4949
master *os.File
5050
slavePath string

libcontainer/console_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ func NewConsole(uid, gid int) (Console, error) {
55
return &windowsConsole{}, nil
66
}
77

8-
// windowsConsole is a Windows psuedo TTY for use within a container.
8+
// windowsConsole is a Windows pseudo TTY for use within a container.
99
type windowsConsole struct {
1010
}
1111

libcontainer/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ type BaseContainer interface {
123123
// SystemError - System error.
124124
Start(process *Process) (err error)
125125

126-
// Run immediatly starts the process inside the conatiner. Returns error if process
126+
// Run immediately starts the process inside the conatiner. Returns error if process
127127
// fails to start. It does not block waiting for the exec fifo after start returns but
128128
// opens the fifo after start returns.
129129
//

libcontainer/process_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (p *setnsProcess) execSetns() error {
146146
}
147147

148148
// terminate sends a SIGKILL to the forked process for the setns routine then waits to
149-
// avoid the process becomming a zombie.
149+
// avoid the process becoming a zombie.
150150
func (p *setnsProcess) terminate() error {
151151
if p.cmd.Process == nil {
152152
return nil

libcontainer/rootfs_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func setupRootfs(config *configs.Config, console *linuxConsole, pipe io.ReadWrit
9393
return newSystemErrorWithCause(err, "reopening /dev/null inside container")
9494
}
9595
}
96-
// remount dev as ro if specifed
96+
// remount dev as ro if specified
9797
for _, m := range config.Mounts {
9898
if libcontainerUtils.CleanPath(m.Destination) == "/dev" {
9999
if m.Flags&syscall.MS_RDONLY != 0 {

libcontainer/standard_init_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (l *linuxStandardInit) Init() error {
143143
if err := pdeath.Restore(); err != nil {
144144
return err
145145
}
146-
// compare the parent from the inital start of the init process and make sure that it did not change.
146+
// compare the parent from the initial start of the init process and make sure that it did not change.
147147
// if the parent changes that means it died and we were reparented to something else so we should
148148
// just kill ourself and not cause problems for someone else.
149149
if syscall.Getppid() != l.parentPid {

utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func fatal(err error) {
1818
os.Exit(1)
1919
}
2020

21-
// setupSpec performs inital setup based on the cli.Context for the container
21+
// setupSpec performs initial setup based on the cli.Context for the container
2222
func setupSpec(context *cli.Context) (*specs.Spec, error) {
2323
bundle := context.String("bundle")
2424
if bundle != "" {

0 commit comments

Comments
 (0)