diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-25 03:11:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-25 03:11:26 +0200 |
| commit | d3689161a2870a56ba5a2837daa2ca3463e24710 (patch) | |
| tree | 32b34eae66a613db706284e6e113a44fccb9f44e /src/main.c | |
| parent | 20604ebc04ce5d3b7d7d63e79f94cf0febf851c5 (diff) | |
mount: add global configuration options for handling of auto mounts
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/main.c b/src/main.c index 35ee1c73e1..54fc0540ac 100644 --- a/src/main.c +++ b/src/main.c @@ -64,6 +64,9 @@ static int arg_crash_chvt = -1; static bool arg_confirm_spawn = false; static bool arg_show_status = true; static bool arg_sysv_console = true; +static bool arg_mount_on_plug = true; +static bool arg_swap_on_plug = true; +static bool arg_mount_auto = true; static FILE* serialization = NULL; @@ -472,16 +475,19 @@ static int config_parse_cpu_affinity( static int parse_config_file(void) { const ConfigItem items[] = { - { "LogLevel", config_parse_level, NULL, "Manager" }, - { "LogTarget", config_parse_target, NULL, "Manager" }, - { "LogColor", config_parse_color, NULL, "Manager" }, - { "LogLocation", config_parse_location, NULL, "Manager" }, - { "DumpCore", config_parse_bool, &arg_dump_core, "Manager" }, - { "CrashShell", config_parse_bool, &arg_crash_shell, "Manager" }, - { "ShowStatus", config_parse_bool, &arg_show_status, "Manager" }, - { "SysVConsole", config_parse_bool, &arg_sysv_console,"Manager" }, - { "CrashChVT", config_parse_int, &arg_crash_chvt, "Manager" }, - { "CPUAffinity", config_parse_cpu_affinity, NULL, "Manager" }, + { "LogLevel", config_parse_level, NULL, "Manager" }, + { "LogTarget", config_parse_target, NULL, "Manager" }, + { "LogColor", config_parse_color, NULL, "Manager" }, + { "LogLocation", config_parse_location, NULL, "Manager" }, + { "DumpCore", config_parse_bool, &arg_dump_core, "Manager" }, + { "CrashShell", config_parse_bool, &arg_crash_shell, "Manager" }, + { "ShowStatus", config_parse_bool, &arg_show_status, "Manager" }, + { "SysVConsole", config_parse_bool, &arg_sysv_console, "Manager" }, + { "CrashChVT", config_parse_int, &arg_crash_chvt, "Manager" }, + { "CPUAffinity", config_parse_cpu_affinity, NULL, "Manager" }, + { "MountOnPlug", config_parse_bool, &arg_mount_on_plug, "Manager" }, + { "SwapOnPlug", config_parse_bool, &arg_swap_on_plug, "Manager" }, + { "MountAuto", config_parse_bool, &arg_mount_auto, "Manager" }, { NULL, NULL, NULL, NULL } }; @@ -986,6 +992,9 @@ int main(int argc, char *argv[]) { m->confirm_spawn = arg_confirm_spawn; m->show_status = arg_show_status; m->sysv_console = arg_sysv_console; + m->mount_on_plug = arg_mount_on_plug; + m->swap_on_plug = arg_swap_on_plug; + m->mount_auto = arg_mount_auto; if ((r = manager_startup(m, serialization, fds)) < 0) log_error("Failed to fully start up daemon: %s", strerror(-r)); |