picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

namespace: change NameSpace → Namespace 

We generally use the casing "Namespace" for the word, and that's visible
in a number of user-facing interfaces, including "RestrictNamespace=" or
"JoinsNamespaceOf=". Let's make sure to use the same casing internally
too.

As discussed in #7024
This commit is contained in:
Lennart Poettering 2017-10-10 09:49:20 +02:00
parent 6e2d7c4f13
commit bb0ff3fb1b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/execute.c
View File

@ -2270,7 +2270,7 @@ static int apply_mount_namespace(
_cleanup_strv_free_ char **rw = NULL, **empty_directories = NULL;
char *tmp = NULL, *var = NULL;
const char *root_dir = NULL, *root_image = NULL;
NameSpaceInfo ns_info = {
NamespaceInfo ns_info = {
.ignore_protect_paths = false,
.private_dev = context->private_devices,
.protect_control_groups = context->protect_control_groups,

6
src/core/namespace.c
View File

@ -898,7 +898,7 @@ static int make_read_only(MountEntry *m, char **blacklist, FILE *proc_self_mount
return r;
}
static bool namespace_info_mount_apivfs(const char *root_directory, const NameSpaceInfo *ns_info) {
static bool namespace_info_mount_apivfs(const char *root_directory, const NamespaceInfo *ns_info) {
assert(ns_info);
/*
@ -916,7 +916,7 @@ static bool namespace_info_mount_apivfs(const char *root_directory, const NameSp
static unsigned namespace_calculate_mounts(
const char* root_directory,
const NameSpaceInfo *ns_info,
const NamespaceInfo *ns_info,
char** read_write_paths,
char** read_only_paths,
char** inaccessible_paths,
@ -960,7 +960,7 @@ static unsigned namespace_calculate_mounts(
int setup_namespace(
const char* root_directory,
const char* root_image,
const NameSpaceInfo *ns_info,
const NamespaceInfo *ns_info,
char** read_write_paths,
char** read_only_paths,
char** inaccessible_paths,

6
src/core/namespace.h
View File

@ -20,7 +20,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
typedef struct NameSpaceInfo NameSpaceInfo;
typedef struct NamespaceInfo NamespaceInfo;
typedef struct BindMount BindMount;
#include <stdbool.h>
@ -57,7 +57,7 @@ typedef enum ProtectSystem {
_PROTECT_SYSTEM_INVALID = -1
} ProtectSystem;
struct NameSpaceInfo {
struct NamespaceInfo {
bool ignore_protect_paths:1;
bool private_dev:1;
bool protect_control_groups:1;
@ -77,7 +77,7 @@ struct BindMount {
int setup_namespace(
const char *root_directory,
const char *root_image,
const NameSpaceInfo *ns_info,
const NamespaceInfo *ns_info,
char **read_write_paths,
char **read_only_paths,
char **inaccessible_paths,

2
src/test/test-ns.c
View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
NULL
};
static const NameSpaceInfo ns_info = {
static const NamespaceInfo ns_info = {
.private_dev = true,
.protect_control_groups = true,
.protect_kernel_tunables = true,