diff options
author | robertswiecki <robert@swiecki.net> | 2023-11-19 16:59:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-19 16:59:56 +0100 |
commit | 3d9a5b2307fb7f49f4e2ee844896e763b65a9605 (patch) | |
tree | 3c66cca7b034d156aaac5c700460f2a2424f56bd | |
parent | 3ff69c0f566645ac92adbae0677ac6c6c700fbec (diff) | |
parent | 727caf9d4ae014f8ee5409e43cf78ebe11fda8b3 (diff) | |
download | nsjail-3d9a5b2307fb7f49f4e2ee844896e763b65a9605.tar.gz |
Merge pull request #227 from philwo/philwo-1
Fix typo (SIKGILL -> SIGKILL)
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | cmdline.cc | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -537,7 +537,7 @@ The command-line options should be self-explanatory, while the proto-buf config --disable_tsc Disable rdtsc and rdtscp instructions. WARNING: To make it effective, you also need to forbid `prctl(PR_SET_TSC, PR_TSC_ENABLE, ...)` in seccomp rules! (x86 and x86_64 only). Dynamic binaries produced by GCC seem to rely on RDTSC, but static ones should work. --forward_signals - Forward fatal signals to the child process instead of always using SIKGILL. + Forward fatal signals to the child process instead of always using SIGKILL. Examples: Wait on a port 31337 for connections, and run /bin/sh @@ -169,7 +169,7 @@ static const struct custom_option custom_opts[] = { { { "macvlan_vs_ma", required_argument, nullptr, 0x705 }, "MAC-address of the 'vs' interface (e.g. \"ba:ad:ba:be:45:00\")" }, { { "macvlan_vs_mo", required_argument, nullptr, 0x706 }, "Mode of the 'vs' interface. Can be either 'private', 'vepa', 'bridge' or 'passthru' (default: 'private')" }, { { "disable_tsc", no_argument, nullptr, 0x707 }, "Disable rdtsc and rdtscp instructions. WARNING: To make it effective, you also need to forbid `prctl(PR_SET_TSC, PR_TSC_ENABLE, ...)` in seccomp rules! (x86 and x86_64 only). Dynamic binaries produced by GCC seem to rely on RDTSC, but static ones should work." }, - { { "forward_signals", no_argument, nullptr, 0x708 }, "Forward fatal signals to the child process instead of always using SIKGILL." }, + { { "forward_signals", no_argument, nullptr, 0x708 }, "Forward fatal signals to the child process instead of always using SIGKILL." }, }; // clang-format on |