Skip to content

Commit

Permalink
Merge pull request #1160 from hqhq/fix_typos
Browse files Browse the repository at this point in the history
Fix all typos found by misspell
  • Loading branch information
dqminh authored Oct 31, 2016
2 parents 8b9b444 + b15668b commit 509b1db
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion libcontainer/console_freebsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"errors"
)

// NewConsole returns an initalized console that can be used within a container by copying bytes
// NewConsole returns an initialized console that can be used within a container by copying bytes
// from the master side to the slave that is attached as the tty for the container's init process.
func NewConsole(uid, gid int) (Console, error) {
return nil, errors.New("libcontainer console is not supported on FreeBSD")
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/console_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/opencontainers/runc/libcontainer/label"
)

// NewConsole returns an initalized console that can be used within a container by copying bytes
// NewConsole returns an initialized console that can be used within a container by copying bytes
// from the master side to the slave that is attached as the tty for the container's init process.
func NewConsole(uid, gid int) (Console, error) {
master, err := os.OpenFile("/dev/ptmx", syscall.O_RDWR|syscall.O_NOCTTY|syscall.O_CLOEXEC, 0)
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/console_solaris.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
)

// NewConsole returns an initalized console that can be used within a container by copying bytes
// NewConsole returns an initialized console that can be used within a container by copying bytes
// from the master side to the slave that is attached as the tty for the container's init process.
func NewConsole(uid, gid int) (Console, error) {
return nil, errors.New("libcontainer console is not supported on Solaris")
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/console_windows.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package libcontainer

// NewConsole returns an initalized console that can be used within a container
// NewConsole returns an initialized console that can be used within a container
func NewConsole(uid, gid int) (Console, error) {
return &windowsConsole{}, nil
}
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ type BaseContainer interface {
// SystemError - System error.
Start(process *Process) (err error)

// Run immediately starts the process inside the conatiner. Returns error if process
// Run immediately starts the process inside the container. Returns error if process
// fails to start. It does not block waiting for the exec fifo after start returns but
// opens the fifo after start returns.
//
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/integration/exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ func testPids(t *testing.T, systemd bool) {
}

// Enforce a restrictive limit. 64 * /bin/true + 1 * shell should cause this
// to fail reliabily.
// to fail reliability.
config.Cgroups.Resources.PidsLimit = 64
out, _, err := runContainer(config, "", "/bin/sh", "-c", `
/bin/true | /bin/true | /bin/true | /bin/true | /bin/true | /bin/true | bin/true | /bin/true |
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/rootfs_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ func pivotRoot(rootfs string) error {
return err
}

// Make oldroot rprivate to make sure our unmounts don't propogate to the
// Make oldroot rprivate to make sure our unmounts don't propagate to the
// host (and thus bork the machine).
if err := syscall.Mount("", ".", "", syscall.MS_PRIVATE|syscall.MS_REC, ""); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/start.bats
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function teardown() {
testcontainer test_busybox2 created


# start conatiner test_busybox1 and test_busybox2
# start container test_busybox1 and test_busybox2
runc start test_busybox1 test_busybox2
[ "$status" -eq 0 ]

Expand Down

0 comments on commit 509b1db

Please sign in to comment.