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.

diff --git a/NEWS b/NEWS
index 2593d0d720c2b6d68ec0f290050ad6c3b16cb8df..6ae49bed90fc9573b056c4e232c35d5a0aab7c3a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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.
 

diff --git a/man/systemctl.xml b/man/systemctl.xml
index c514c849265bd944f3848bfcb91e3cd62c85ffcf..f24a87739512ac15fc2349b498b1e087ba408a2a 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -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>

diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
index b1582252c30cc328548c99bb6fc9e2fd067c1615..c34c7fb10ebc23b96918dc71ac69250ebaac29a9 100644 (file)
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -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'

diff --git a/src/rpm/systemd-update-helper.in b/src/rpm/systemd-update-helper.in
index 9063a2cc3bdaba7a054414c8393e8659885bf4ba..e8bc1e5921520b515b7a7fd9fe805f2a6c7f68de 100755 (executable)
--- a/src/rpm/systemd-update-helper.in
+++ b/src/rpm/systemd-update-helper.in
@@ -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

diff --git a/src/systemctl/systemctl-main.c b/src/systemctl/systemctl-main.c
index 3b8a5e9088e4a38e8088338f6c94788bda13bd55..565b3a8878adb5505912e7759aff1a5fad56b037 100644 (file)
--- a/src/systemctl/systemctl-main.c
+++ b/src/systemctl/systemctl-main.c
@@ -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 */

diff --git a/src/systemctl/systemctl-start-unit.c b/src/systemctl/systemctl-start-unit.c
index 6a2981d9f7a216c46e2b0563e55d6f6cd95b0ea9..ded4437bc6728356b731224dcfd8b0f2acfe91f4 100644 (file)
--- a/src/systemctl/systemctl-start-unit.c
+++ b/src/systemctl/systemctl-start-unit.c
@@ -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 */

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 0c9dd3b0afb012ff772f6e3b4a11cd8fc254b00b..3d3ed98fcd2ed088404877d69b2ef82101662a12 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -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"