diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-24 13:53:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-24 13:53:34 +0200 |
| commit | 8d8e945624a0080073d94941f3032b8fa3b3aa15 (patch) | |
| tree | 502fbc4700f5e093fe094cad2e49c957e626cd3f /src/core/main.c | |
| parent | 25f5971b5e0b3ab5b91a7d0359cd7f5a5094c1d0 (diff) | |
manager: drop MountAuto= and SwapAuto= options
The ability to set MountAuto=no and SwapAuto=no was useful during the
adoption phase of systemd, so that distributions could stick to their
classic mount scripts a bit longer. It is about time to get rid of it
now.
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/core/main.c b/src/core/main.c index 290de26022..e9fece8f7d 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -76,8 +76,6 @@ static bool arg_show_status = true; #ifdef HAVE_SYSV_COMPAT static bool arg_sysv_console = true; #endif -static bool arg_mount_auto = true; -static bool arg_swap_auto = true; static char **arg_default_controllers = NULL; static char ***arg_join_controllers = NULL; static ExecOutput arg_default_std_output = EXEC_OUTPUT_JOURNAL; @@ -658,8 +656,6 @@ static int parse_config_file(void) { #endif { "Manager", "CrashChVT", config_parse_int, 0, &arg_crash_chvt }, { "Manager", "CPUAffinity", config_parse_cpu_affinity2, 0, NULL }, - { "Manager", "MountAuto", config_parse_bool, 0, &arg_mount_auto }, - { "Manager", "SwapAuto", config_parse_bool, 0, &arg_swap_auto }, { "Manager", "DefaultControllers", config_parse_strv, 0, &arg_default_controllers }, { "Manager", "DefaultStandardOutput", config_parse_output, 0, &arg_default_std_output }, { "Manager", "DefaultStandardError", config_parse_output, 0, &arg_default_std_error }, @@ -1427,8 +1423,6 @@ int main(int argc, char *argv[]) { #ifdef HAVE_SYSV_COMPAT m->sysv_console = arg_sysv_console; #endif - m->mount_auto = arg_mount_auto; - m->swap_auto = arg_swap_auto; m->default_std_output = arg_default_std_output; m->default_std_error = arg_default_std_error; m->runtime_watchdog = arg_runtime_watchdog; |