mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 22:37:14 +08:00
Merge pull request #4300 from lifubang/backport-codespell-2.3.0
[1.1] Fix codespell warnings
This commit is contained in:
@@ -61,7 +61,7 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- name: install deps
|
||||
# Version of codespell bundled with Ubuntu is way old, so use pip.
|
||||
run: pip install codespell
|
||||
run: pip install codespell==v2.3.0
|
||||
- name: run codespell
|
||||
run: codespell
|
||||
|
||||
|
||||
+8
-8
@@ -27,7 +27,7 @@ var featuresCommand = cli.Command{
|
||||
return err
|
||||
}
|
||||
|
||||
tru := true
|
||||
t := true
|
||||
|
||||
feat := features.Features{
|
||||
OCIVersionMin: "1.0.0",
|
||||
@@ -43,23 +43,23 @@ var featuresCommand = cli.Command{
|
||||
Namespaces: specconv.KnownNamespaces(),
|
||||
Capabilities: capabilities.KnownCapabilities(),
|
||||
Cgroup: &features.Cgroup{
|
||||
V1: &tru,
|
||||
V2: &tru,
|
||||
Systemd: &tru,
|
||||
SystemdUser: &tru,
|
||||
V1: &t,
|
||||
V2: &t,
|
||||
Systemd: &t,
|
||||
SystemdUser: &t,
|
||||
},
|
||||
Apparmor: &features.Apparmor{
|
||||
Enabled: &tru,
|
||||
Enabled: &t,
|
||||
},
|
||||
Selinux: &features.Selinux{
|
||||
Enabled: &tru,
|
||||
Enabled: &t,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
if seccomp.Enabled {
|
||||
feat.Linux.Seccomp = &features.Seccomp{
|
||||
Enabled: &tru,
|
||||
Enabled: &t,
|
||||
Actions: seccomp.KnownActions(),
|
||||
Operators: seccomp.KnownOperators(),
|
||||
Archs: seccomp.KnownArchs(),
|
||||
|
||||
+2
-3
@@ -168,9 +168,8 @@ func setupIO(process *libcontainer.Process, rootuid, rootgid int, createTTY, det
|
||||
return setupProcessPipes(process, rootuid, rootgid)
|
||||
}
|
||||
|
||||
// createPidFile creates a file with the processes pid inside it atomically
|
||||
// it creates a temp file with the paths filename + '.' infront of it
|
||||
// then renames the file
|
||||
// createPidFile creates a file containing the PID,
|
||||
// doing so atomically (via create and rename).
|
||||
func createPidFile(path string, process *libcontainer.Process) error {
|
||||
pid, err := process.Pid()
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user