systemctl: rename enqueue-marked-jobs to enqueue-marked
Closes #40883. As described in the issue, it's not "jobs" that are marked, and also the name is unnecessarilly long. I think we don't need any compatibility measures here. At least in the rpm world, package upgrade scripts go through the helper which is part of the package so the new systemctl and the new helper are upgraded together.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
@@ -170,7 +170,7 @@ CHANGES WITH 260 in spe:
|
||||
|
||||
* EnqueueMarkedJobs() D-Bus method now has a Varlink counterpart.
|
||||
|
||||
* systemctl gained a new 'enqueue-marked-jobs' verb, which calls the
|
||||
* systemctl gained a new 'enqueue-marked' verb, which calls the
|
||||
EnqueueMarkedJobs() D-Bus method. The '--marked' parameter, which was
|
||||
previously used for the same purpose, is now deprecated.
|
||||
|
||||
|
||||
+2
-2
@@ -501,7 +501,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><command>enqueue-marked-jobs</command></term>
|
||||
<term><command>enqueue-marked</command></term>
|
||||
|
||||
<listitem><para>Enqueue start/stop/restart/reload jobs for all units that have the respective
|
||||
<literal>needs-*</literal> markers set. When a unit marked for reload does not support reload,
|
||||
@@ -521,7 +521,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
|
||||
are not running yet, they will be started.</para>
|
||||
|
||||
<para>When used in combination with <option>--marked</option>, it is a deprecated alias of
|
||||
<command>enqueue-marked-jobs</command>.</para>
|
||||
<command>enqueue-marked</command>.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
|
||||
@@ -234,7 +234,7 @@ _systemctl () {
|
||||
list-timers list-units list-unit-files poweroff
|
||||
reboot rescue show-environment suspend get-default
|
||||
is-system-running preset-all list-automounts list-paths
|
||||
enqueue-marked-jobs'
|
||||
enqueue-marked'
|
||||
[FILE]='link switch-root'
|
||||
[TARGETS]='set-default'
|
||||
[MACHINES]='list-machines'
|
||||
|
||||
@@ -99,7 +99,7 @@ case "$command" in
|
||||
fi
|
||||
|
||||
if [[ "$command" =~ restart ]]; then
|
||||
systemctl enqueue-marked-jobs
|
||||
systemctl enqueue-marked
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -120,7 +120,7 @@ case "$command" in
|
||||
|
||||
for user in $users; do
|
||||
SYSTEMD_BUS_TIMEOUT={{UPDATE_HELPER_USER_TIMEOUT_SEC}}s \
|
||||
systemctl --user -M "$user@" enqueue-marked-jobs &
|
||||
systemctl --user -M "$user@" enqueue-marked &
|
||||
done
|
||||
wait
|
||||
fi
|
||||
|
||||
@@ -65,9 +65,9 @@ static int systemctl_main(int argc, char *argv[]) {
|
||||
{ "reload", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "try-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "enqueue-marked-jobs", 1, 1, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "enqueue-marked", 1, 1, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "reload-or-restart", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "reload-or-try-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with old systemctl <= 228 */
|
||||
{ "reload-or-try-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with systemctl <= 228 */
|
||||
{ "try-reload-or-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "force-reload", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with SysV */
|
||||
{ "condreload", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with ALTLinux */
|
||||
|
||||
@@ -332,16 +332,16 @@ int verb_start(int argc, char *argv[], void *userdata) {
|
||||
job_type = "start";
|
||||
mode = "isolate";
|
||||
suffix = ".target";
|
||||
} else if (streq(argv[0], "enqueue-marked-jobs") || arg_marked) {
|
||||
} else if (streq(argv[0], "enqueue-marked") || arg_marked) {
|
||||
is_enqueue_marked_jobs = true;
|
||||
method = job_type = mode = NULL;
|
||||
|
||||
if (arg_show_transaction)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
|
||||
"--show-transaction is not supported for enqueue-marked-jobs.");
|
||||
"--show-transaction is not supported for enqueue-marked.");
|
||||
|
||||
if (arg_marked)
|
||||
log_warning("--marked is deprecated. Please use systemctl enqueue-marked-jobs instead.");
|
||||
log_warning("--marked is deprecated. Please use systemctl enqueue-marked instead.");
|
||||
|
||||
} else {
|
||||
/* A command in style of "systemctl start <unit1> <unit2> …", "systemctl stop <unit1> <unit2> …" and so on */
|
||||
|
||||
@@ -143,7 +143,7 @@ static int systemctl_help(void) {
|
||||
" reload UNIT... Reload one or more units\n"
|
||||
" restart UNIT... Start or restart one or more units\n"
|
||||
" try-restart UNIT... Restart one or more units if active\n"
|
||||
" enqueue-marked-jobs Enqueue all marked unit jobs\n"
|
||||
" enqueue-marked Enqueue jobs for all marked units\n"
|
||||
" reload-or-restart UNIT... Reload one or more units if possible,\n"
|
||||
" otherwise start or restart\n"
|
||||
" try-reload-or-restart UNIT... If active, reload one or more units,\n"
|
||||
|
||||
Reference in New Issue
Block a user