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 <h.huangqiang@huawei.com>
This commit is contained in:
parent
4c8007f34a
commit
b15668b36d
|
@ -6,7 +6,7 @@ import (
|
||||||
"errors"
|
"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.
|
// 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) {
|
func NewConsole(uid, gid int) (Console, error) {
|
||||||
return nil, errors.New("libcontainer console is not supported on FreeBSD")
|
return nil, errors.New("libcontainer console is not supported on FreeBSD")
|
||||||
|
|
|
@ -10,7 +10,7 @@ import (
|
||||||
"github.com/opencontainers/runc/libcontainer/label"
|
"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.
|
// 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) {
|
func NewConsole(uid, gid int) (Console, error) {
|
||||||
master, err := os.OpenFile("/dev/ptmx", syscall.O_RDWR|syscall.O_NOCTTY|syscall.O_CLOEXEC, 0)
|
master, err := os.OpenFile("/dev/ptmx", syscall.O_RDWR|syscall.O_NOCTTY|syscall.O_CLOEXEC, 0)
|
||||||
|
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"errors"
|
"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.
|
// 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) {
|
func NewConsole(uid, gid int) (Console, error) {
|
||||||
return nil, errors.New("libcontainer console is not supported on Solaris")
|
return nil, errors.New("libcontainer console is not supported on Solaris")
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package libcontainer
|
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) {
|
func NewConsole(uid, gid int) (Console, error) {
|
||||||
return &windowsConsole{}, nil
|
return &windowsConsole{}, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,7 +123,7 @@ type BaseContainer interface {
|
||||||
// SystemError - System error.
|
// SystemError - System error.
|
||||||
Start(process *Process) (err 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
|
// fails to start. It does not block waiting for the exec fifo after start returns but
|
||||||
// opens the fifo after start returns.
|
// opens the fifo after start returns.
|
||||||
//
|
//
|
||||||
|
|
|
@ -602,7 +602,7 @@ func testPids(t *testing.T, systemd bool) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enforce a restrictive limit. 64 * /bin/true + 1 * shell should cause this
|
// Enforce a restrictive limit. 64 * /bin/true + 1 * shell should cause this
|
||||||
// to fail reliabily.
|
// to fail reliability.
|
||||||
config.Cgroups.Resources.PidsLimit = 64
|
config.Cgroups.Resources.PidsLimit = 64
|
||||||
out, _, err := runContainer(config, "", "/bin/sh", "-c", `
|
out, _, err := runContainer(config, "", "/bin/sh", "-c", `
|
||||||
/bin/true | /bin/true | /bin/true | /bin/true | /bin/true | /bin/true | bin/true | /bin/true |
|
/bin/true | /bin/true | /bin/true | /bin/true | /bin/true | /bin/true | bin/true | /bin/true |
|
||||||
|
|
|
@ -631,7 +631,7 @@ func pivotRoot(rootfs string) error {
|
||||||
return err
|
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).
|
// host (and thus bork the machine).
|
||||||
if err := syscall.Mount("", ".", "", syscall.MS_PRIVATE|syscall.MS_REC, ""); err != nil {
|
if err := syscall.Mount("", ".", "", syscall.MS_PRIVATE|syscall.MS_REC, ""); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -23,7 +23,7 @@ function teardown() {
|
||||||
testcontainer test_busybox2 created
|
testcontainer test_busybox2 created
|
||||||
|
|
||||||
|
|
||||||
# start conatiner test_busybox1 and test_busybox2
|
# start container test_busybox1 and test_busybox2
|
||||||
runc start test_busybox1 test_busybox2
|
runc start test_busybox1 test_busybox2
|
||||||
[ "$status" -eq 0 ]
|
[ "$status" -eq 0 ]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue