dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

runtime-scope: add helper that turns RuntimeScope enum into --system/--user string

Browse Source
This commit is contained in:
Lennart Poettering
2023-03-09 17:41:25 +01:00
parent 4870133bfa
commit 40d73340fa
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/basic/runtime-scope.c
View File

@@ -10,3 +10,11 @@ static const char* const runtime_scope_table[_RUNTIME_SCOPE_MAX] = {
};
DEFINE_STRING_TABLE_LOOKUP(runtime_scope, RuntimeScope);
static const char* const runtime_scope_cmdline_option_table[_RUNTIME_SCOPE_MAX] = {
[RUNTIME_SCOPE_SYSTEM] = "--system",
[RUNTIME_SCOPE_USER] = "--user",
[RUNTIME_SCOPE_GLOBAL] = "--global",
};
DEFINE_STRING_TABLE_LOOKUP_TO_STRING(runtime_scope_cmdline_option, RuntimeScope);

2
src/basic/runtime-scope.h
View File

@@ -15,3 +15,5 @@ typedef enum RuntimeScope {
const char *runtime_scope_to_string(RuntimeScope scope) _const_;
RuntimeScope runtime_scope_from_string(const char *s) _const_;
const char *runtime_scope_cmdline_option_to_string(RuntimeScope scope) _const_;

2
src/core/main.c
View File

@@ -1867,7 +1867,7 @@ static int do_reexecute(
if (switch_root_dir)
args[i++] = "--switched-root";
args[i++] = arg_runtime_scope == RUNTIME_SCOPE_SYSTEM ? "--system" : "--user";
args[i++] = runtime_scope_cmdline_option_to_string(arg_runtime_scope);
args[i++] = "--deserialize";
args[i++] = sfd;
args[i++] = NULL;

2
src/systemctl/systemctl-start-special.c
View File

@@ -238,7 +238,7 @@ int verb_start_system_special(int argc, char *argv[], void *userdata) {
if (arg_runtime_scope != RUNTIME_SCOPE_SYSTEM)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Bad action for %s mode.",
arg_runtime_scope == RUNTIME_SCOPE_GLOBAL ? "--global" : "--user");
runtime_scope_cmdline_option_to_string(arg_runtime_scope));
return verb_start_special(argc, argv, userdata);
}