shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

core/namespace: rename SYSFS -> BIND_SYSFS

Browse Source 
No functional change, just preparation for later commits.
This commit is contained in:
Yu Watanabe 2023-02-18 07:12:37 +09:00
parent f63a2c4821
commit 10028263fd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/namespace.c
View File

@ -61,7 +61,7 @@ typedef enum MountMode {
PRIVATE_DEV,
BIND_DEV,
EMPTY_DIR,
SYSFS,
BIND_SYSFS,
PROCFS,
READONLY,
READWRITE,
@ -103,7 +103,7 @@ typedef struct MountEntry {
static const MountEntry apivfs_table[] = {
{ "/proc", PROCFS, false },
{ "/dev", BIND_DEV, false },
{ "/sys", SYSFS, false },
{ "/sys", BIND_SYSFS, false },
{ "/run", RUN, false, .options_const = "mode=0755" TMPFS_LIMITS_RUN, .flags = MS_NOSUID|MS_NODEV|MS_STRICTATIME },
};
@ -233,7 +233,7 @@ static const char * const mount_mode_table[_MOUNT_MODE_MAX] = {
[PRIVATE_DEV] = "private-dev",
[BIND_DEV] = "bind-dev",
[EMPTY_DIR] = "empty",
[SYSFS] = "sysfs",
[BIND_SYSFS] = "bind-sysfs",
[PROCFS] = "procfs",
[READONLY] = "read-only",
[READWRITE] = "read-write",
@ -288,7 +288,7 @@ static bool mount_entry_read_only(const MountEntry *p) {
static bool mount_entry_noexec(const MountEntry *p) {
assert(p);
return p->noexec || IN_SET(p->mode, NOEXEC, INACCESSIBLE, SYSFS, PROCFS);
return p->noexec || IN_SET(p->mode, NOEXEC, INACCESSIBLE, BIND_SYSFS, PROCFS);
}
static bool mount_entry_exec(const MountEntry *p) {
@ -1053,7 +1053,7 @@ static int mount_bind_dev(const MountEntry *m) {
return 1;
}
static int mount_sysfs(const MountEntry *m) {
static int mount_bind_sysfs(const MountEntry *m) {
int r;
assert(m);
@ -1483,8 +1483,8 @@ static int apply_one_mount(
case BIND_DEV:
return mount_bind_dev(m);
case SYSFS:
return mount_sysfs(m);
case BIND_SYSFS:
return mount_bind_sysfs(m);
case PROCFS:
return mount_procfs(m, ns_info);