From b15668b36d0869a910dce5cc08e382b73170eaa3 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Sat, 29 Oct 2016 14:14:42 +0800 Subject: [PATCH] Fix all typos found by misspell I use the same tool (https://github.com/client9/misspell) as Daniel used a few days ago, don't why he missed these typos at that time. Signed-off-by: Qiang Huang --- libcontainer/console_freebsd.go | 2 +- libcontainer/console_linux.go | 2 +- libcontainer/console_solaris.go | 2 +- libcontainer/console_windows.go | 2 +- libcontainer/container.go | 2 +- libcontainer/integration/exec_test.go | 2 +- libcontainer/rootfs_linux.go | 2 +- tests/integration/start.bats | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libcontainer/console_freebsd.go b/libcontainer/console_freebsd.go index 3c89eda0..300e34c4 100644 --- a/libcontainer/console_freebsd.go +++ b/libcontainer/console_freebsd.go @@ -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") diff --git a/libcontainer/console_linux.go b/libcontainer/console_linux.go index 5bc2fd75..000c74a0 100644 --- a/libcontainer/console_linux.go +++ b/libcontainer/console_linux.go @@ -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) diff --git a/libcontainer/console_solaris.go b/libcontainer/console_solaris.go index 9e89f505..e90ca0d8 100644 --- a/libcontainer/console_solaris.go +++ b/libcontainer/console_solaris.go @@ -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") diff --git a/libcontainer/console_windows.go b/libcontainer/console_windows.go index fc157e9b..2baf3137 100644 --- a/libcontainer/console_windows.go +++ b/libcontainer/console_windows.go @@ -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 } diff --git a/libcontainer/container.go b/libcontainer/container.go index 07822bf8..2950a83e 100644 --- a/libcontainer/container.go +++ b/libcontainer/container.go @@ -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. // diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go index 1fe1915a..2ba98d64 100644 --- a/libcontainer/integration/exec_test.go +++ b/libcontainer/integration/exec_test.go @@ -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 | diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go index 294083b5..d4f8595f 100644 --- a/libcontainer/rootfs_linux.go +++ b/libcontainer/rootfs_linux.go @@ -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 diff --git a/tests/integration/start.bats b/tests/integration/start.bats index fb21e7f3..502103c9 100644 --- a/tests/integration/start.bats +++ b/tests/integration/start.bats @@ -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 ]