diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /util-linux/nsenter.c | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'util-linux/nsenter.c')
| -rw-r--r-- | util-linux/nsenter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c index e6339da2f..1aa045b35 100644 --- a/util-linux/nsenter.c +++ b/util-linux/nsenter.c | |||
| @@ -93,7 +93,7 @@ enum { | |||
| 93 | * The user namespace comes first, so that it is entered first. | 93 | * The user namespace comes first, so that it is entered first. |
| 94 | * This gives an unprivileged user the potential to enter other namespaces. | 94 | * This gives an unprivileged user the potential to enter other namespaces. |
| 95 | */ | 95 | */ |
| 96 | static const struct namespace_descr ns_list[] = { | 96 | static const struct namespace_descr ns_list[] ALIGN_INT = { |
| 97 | { CLONE_NEWUSER, "ns/user", }, | 97 | { CLONE_NEWUSER, "ns/user", }, |
| 98 | { CLONE_NEWIPC, "ns/ipc", }, | 98 | { CLONE_NEWIPC, "ns/ipc", }, |
| 99 | { CLONE_NEWUTS, "ns/uts", }, | 99 | { CLONE_NEWUTS, "ns/uts", }, |