From 26e1e9734524d5fc53b2ca876d5d5478b3ef3c57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 15 Nov 2019 09:57:24 +0100 Subject: [PATCH] analyze: deprecate the commands moved to systemctl This just removes the commands from --help and the man pages, everything works as before. --- man/systemd-analyze.xml | 50 ----------------------------------------- src/analyze/analyze.c | 7 ++---- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index 02d7179e4cf..dcb7cf29c1c 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -39,25 +39,6 @@ UNIT - - systemd-analyze - OPTIONS - log-level - LEVEL - - - systemd-analyze - OPTIONS - log-target - TARGET - - - systemd-analyze - OPTIONS - service-watchdogs - BOOL - - systemd-analyze OPTIONS @@ -241,37 +222,6 @@ multi-user.target @47.820s - - <command>systemd-analyze log-level [<replaceable>LEVEL</replaceable>]</command> - - systemd-analyze log-level prints the current log level of the - systemd daemon. If an optional argument LEVEL is - provided, then the command changes the current log level of the systemd daemon to - LEVEL (accepts the same values as described in - systemd1). - - - - <command>systemd-analyze log-target [<replaceable>TARGET</replaceable>]</command> - - systemd-analyze log-target prints the current log target of the - systemd daemon. If an optional argument TARGET is - provided, then the command changes the current log target of the systemd daemon to - TARGET (accepts the same values as , described - in systemd1). - - - - <command>systemd-analyze service-watchdogs [yes|no]</command> - - systemd-analyze service-watchdogs prints the current state of service runtime - watchdogs of the systemd daemon. If an optional boolean argument is provided, then - globally enables or disables the service runtime watchdogs () and - emergency actions (e.g. or ); see - systemd.service5. - The hardware watchdog is not affected by this setting. - - <command>systemd-analyze dump</command> diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index b242f70b371..991e61de7e7 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -2248,8 +2248,6 @@ static int help(int argc, char *argv[], void *userdata) { " critical-chain [UNIT...] Print a tree of the time critical chain of units\n" " plot Output SVG graphic showing service initialization\n" " dot [UNIT...] Output dependency graph in %s format\n" - " log-level [LEVEL] Get/set logging threshold for manager\n" - " log-target [TARGET] Get/set logging target for manager\n" " dump Output state serialization of service manager\n" " cat-config Show configuration file and drop-ins\n" " unit-files List files and symlinks for units\n" @@ -2258,7 +2256,6 @@ static int help(int argc, char *argv[], void *userdata) { " syscall-filter [NAME...] Print list of syscalls in seccomp filter\n" " condition CONDITION... Evaluate conditions and asserts\n" " verify FILE... Check unit files for correctness\n" - " service-watchdogs [BOOL] Get/set service watchdog state\n" " calendar SPEC... Validate repetitive calendar time events\n" " timestamp TIMESTAMP... Validate a timestamp\n" " timespan SPAN... Validate a time span\n" @@ -2479,13 +2476,14 @@ static int run(int argc, char *argv[]) { { "critical-chain", VERB_ANY, VERB_ANY, 0, analyze_critical_chain }, { "plot", VERB_ANY, 1, 0, analyze_plot }, { "dot", VERB_ANY, VERB_ANY, 0, dot }, + /* The following seven verbs are deprecated */ { "log-level", VERB_ANY, 2, 0, get_or_set_log_level }, { "log-target", VERB_ANY, 2, 0, get_or_set_log_target }, - /* The following four verbs are deprecated aliases */ { "set-log-level", 2, 2, 0, set_log_level }, { "get-log-level", VERB_ANY, 1, 0, get_log_level }, { "set-log-target", 2, 2, 0, set_log_target }, { "get-log-target", VERB_ANY, 1, 0, get_log_target }, + { "service-watchdogs", VERB_ANY, 2, 0, service_watchdogs }, { "dump", VERB_ANY, 1, 0, dump }, { "cat-config", 2, VERB_ANY, 0, cat_config }, { "unit-files", VERB_ANY, VERB_ANY, 0, do_unit_files }, @@ -2497,7 +2495,6 @@ static int run(int argc, char *argv[]) { { "calendar", 2, VERB_ANY, 0, test_calendar }, { "timestamp", 2, VERB_ANY, 0, test_timestamp }, { "timespan", 2, VERB_ANY, 0, dump_timespan }, - { "service-watchdogs", VERB_ANY, 2, 0, service_watchdogs }, { "security", VERB_ANY, VERB_ANY, 0, do_security }, {} }; -- 2.39.2