treewide: split commandline into command line

diff --git a/NEWS b/NEWS
index 8ba35e5b3151bcaad39972a89a1576000af9ac62..d624c2a799b5e9111945e7f917857a78aca8546f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8756,7 +8756,7 @@ CHANGES WITH 236:
 
         * The watchdog device PID 1 will ping may now be configured through the
           WatchdogDevice= configuration file setting, or by setting the
-          systemd.watchdog_service= kernel commandline option.
+          systemd.watchdog_service= kernel command line option.
 
         * systemd-resolved's gained support for registering DNS-SD services on
           the local network using MulticastDNS. Services may either be

diff --git a/man/hostname.xml b/man/hostname.xml
index d0507037929466c7771d73ad35aa0ac1189cd819..a3dae72fd9409f31dffc0453da562febaee03b65 100644 (file)
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -56,7 +56,7 @@
     <para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> and the
     associated tools will obtain the hostname in the following ways:</para>
     <itemizedlist>
-      <listitem><para>If the kernel commandline parameter <varname>systemd.hostname=</varname> specifies a
+      <listitem><para>If the kernel command line parameter <varname>systemd.hostname=</varname> specifies a
       valid hostname,
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> will use it
       to set the hostname during early boot, see

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 22aebfbafec840862961ad85ba5921ea800568c7..1a424c1e2b959940d9051d69b31efa9ff463a4e0 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1643,7 +1643,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
           <listitem>
             <para>Shut down and reboot the system via <command>kexec</command>. This command will load a
             kexec kernel if one wasn't loaded yet or fail. A kernel may be loaded earlier by a separate step,
-            this is particularly useful if a custom initrd or additional kernel commandline options are
+            this is particularly useful if a custom initrd or additional kernel command line options are
             desired. The <option>--force</option> can be used to continue without a kexec kernel, i.e. to
             perform a normal reboot. The final reboot step is equivalent to
             <command>systemctl start kexec.target --job-mode=replace-irreversibly --no-block</command>.

diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 14fd217429683313e6fce72aec3b7ded17700205..0c1efabcc1b380b12b2db7154bbd674716358d8d 100644 (file)
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -354,7 +354,7 @@ flags:   ...
       <varlistentry>
         <term><varname>COREDUMP_CONTAINER_CMDLINE=</varname></term>
 
-        <listitem><para>For processes running in a container, the commandline of the process spawning the
+        <listitem><para>For processes running in a container, the command line of the process spawning the
         container (the first parent process with a different mount namespace).</para>
 
         <xi:include href="version-info.xml" xpointer="v248"/></listitem>

diff --git a/man/ukify.xml b/man/ukify.xml
index 0d8a2277961ebbb09cef40e908490e669b850ee2..f6cd6804bbccde2e486439d5f3a506974b4371cb 100644 (file)
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -170,7 +170,7 @@
     <para>The following options and settings are understood:</para>
 
     <refsect2>
-      <title>Commandline-only options</title>
+      <title>Command line-only options</title>
 
       <variablelist>
         <varlistentry>
@@ -178,7 +178,7 @@
 
           <listitem><para>Load configuration from the given config file. In general, settings specified in
           the config file have lower precedence than the settings specified via options. In cases where the
-          commandline option does not fully override the config file setting are explicitly mentioned in the
+          command line option does not fully override the config file setting are explicitly mentioned in the
           descriptions of individual options.</para>
 
           <xi:include href="version-info.xml" xpointer="v254"/></listitem>
@@ -243,7 +243,7 @@
           <term><option>--summary</option></term>
 
           <listitem><para>Print a summary of loaded config and exit. This is useful to check how the options
-          form the configuration file and the commandline are combined.</para>
+          form the configuration file and the command line are combined.</para>
 
           <xi:include href="version-info.xml" xpointer="v254"/></listitem>
         </varlistentry>
@@ -489,7 +489,7 @@
     <refsect2>
       <title>[PCRSignature:<replaceable>NAME</replaceable>] section</title>
 
-      <para>In the config file, those options are grouped by section. On the commandline, they
+      <para>In the config file, those options are grouped by section. On the command line, they
       must be specified in the same order. The sections specified in both sources are combined.
       </para>
 
@@ -498,7 +498,7 @@
           <term><varname>PCRPrivateKey=<replaceable>PATH</replaceable></varname></term>
           <term><option>--pcr-private-key=<replaceable>PATH</replaceable></option></term>
 
-          <listitem><para>A private key to use for signing PCR policies. On the commandline, this option may
+          <listitem><para>A private key to use for signing PCR policies. On the command line, this option may
           be specified more than once, in which case multiple signatures will be made.</para>
 
           <xi:include href="version-info.xml" xpointer="v253"/></listitem>
@@ -510,9 +510,9 @@
 
           <listitem><para>A public key to use for signing PCR policies.</para>
 
-          <para>On the commandline, this option may be specified more than once, similarly to the
+          <para>On the command line, this option may be specified more than once, similarly to the
           <option>--pcr-private-key=</option> option. If not present, the public keys will be extracted from
-          the private keys. On the commandline, if present, the this option must be specified the same number
+          the private keys. On the command line, if present, the this option must be specified the same number
           of times as the <option>--pcr-private-key=</option> option.</para>
 
           <xi:include href="version-info.xml" xpointer="v253"/></listitem>
@@ -528,7 +528,7 @@
           <citerefentry><refentrytitle>systemd-measure</refentrytitle><manvolnum>1</manvolnum></citerefentry>
           will be used.</para>
 
-          <para>On the commandline, when this argument is present, it must appear the same number of times as
+          <para>On the command line, when this argument is present, it must appear the same number of times as
           the <option>--pcr-private-key=</option> option. </para>
 
           <xi:include href="version-info.xml" xpointer="v253"/></listitem>
@@ -621,7 +621,7 @@ $ ukify -c ukify.conf build \
 
       <para>One "initrd" (<filename index='false'>early_cpio</filename>) is specified in the config file, and
       the other initrd (<filename index='false'>initramfs-6.0.9-300.fc37.x86_64.img</filename>) is specified
-      on the commandline. This may be useful for example when the first initrd contains microcode for the CPU
+      on the command line. This may be useful for example when the first initrd contains microcode for the CPU
       and does not need to be updated when the kernel version changes, unlike the actual initrd.</para>
     </example>
 

diff --git a/src/basic/log.c b/src/basic/log.c
index a41d4bcdb62b15d10142fddca5398f8b2562e574..7181f3a2ad18a11d14646920df272271767677ec 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1276,7 +1276,7 @@ static bool should_parse_proc_cmdline(void) {
         if (getpid_cached() == 1)
                 return true;
 
-        /* Otherwise, parse the commandline if invoked directly by systemd. */
+        /* Otherwise, parse the command line if invoked directly by systemd. */
         return invoked_by_systemd();
 }
 

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index ea3456f6b81d17b95c7fe82e6a3b6b884f0f2e49..4928379bd757a8ffbc045f4d46a9aef2b8027f37 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -198,7 +198,7 @@ int get_process_cmdline(pid_t pid, size_t max_columns, ProcessCmdlineFlags flags
         assert(pid >= 0);
         assert(ret);
 
-        /* Retrieve and format a commandline. See above for discussion of retrieval options.
+        /* Retrieve and format a command line. See above for discussion of retrieval options.
          *
          * There are two main formatting modes:
          *

diff --git a/src/core/main.c b/src/core/main.c
index 21582ddd0c5581f058413406b4b44e8062d07d55..6f779586d077265f99c80f5b42f3ed5741767172 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -780,7 +780,7 @@ static void set_manager_settings(Manager *m) {
         if (r < 0)
                 log_warning_errno(r, "Failed to set watchdog pretimeout governor to '%s', ignoring: %m", arg_watchdog_pretimeout_governor);
 
-        manager_set_show_status(m, arg_show_status, "commandline");
+        manager_set_show_status(m, arg_show_status, "command line");
         m->status_unit_format = arg_status_unit_format;
 }
 
@@ -2130,15 +2130,15 @@ static void log_execution_mode(bool *ret_first_boot) {
                         _cleanup_free_ char *id_text = NULL;
 
                         /* Let's check whether we are in first boot. First, check if an override was
-                         * specified on the kernel commandline. If yes, we honour that. */
+                         * specified on the kernel command line. If yes, we honour that. */
 
                         r = proc_cmdline_get_bool("systemd.condition-first-boot", /* flags = */ 0, &first_boot);
                         if (r < 0)
-                                log_debug_errno(r, "Failed to parse systemd.condition-first-boot= kernel commandline argument, ignoring: %m");
+                                log_debug_errno(r, "Failed to parse systemd.condition-first-boot= kernel command line argument, ignoring: %m");
 
                         if (r > 0)
                                 log_full(first_boot ? LOG_INFO : LOG_DEBUG,
-                                         "Kernel commandline argument says we are %s first boot.",
+                                         "Kernel command line argument says we are %s first boot.",
                                          first_boot ? "in" : "not in");
                         else {
                                 /* Second, perform autodetection. We use /etc/machine-id as flag file for
@@ -2991,7 +2991,7 @@ int main(int argc, char *argv[]) {
 
         r = parse_argv(argc, argv);
         if (r < 0) {
-                error_message = "Failed to parse commandline arguments";
+                error_message = "Failed to parse command line arguments";
                 goto finish;
         }
 

diff --git a/src/shared/install.c b/src/shared/install.c
index c171a2330e8c3d37c06251c903540ddc1d2d0680..e25e78629ef40024f0ccc3661ac80abe3503abf8 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2334,7 +2334,7 @@ int unit_file_unmask(
                 if (!unit_name_is_valid(*name, UNIT_NAME_ANY))
                         return -EINVAL;
 
-                /* If root_dir is set, we don't care about kernel commandline or generators.
+                /* If root_dir is set, we don't care about kernel command line or generators.
                  * But if it is not set, we need to check for interference. */
                 if (!root_dir) {
                         _cleanup_(install_info_clear) InstallInfo info = {

diff --git a/src/systemctl/systemctl-set-default.c b/src/systemctl/systemctl-set-default.c
index 136a4f3b6679b9066ece6ff754bec54f4e40288f..58c2bc335dc03a64dcbb54b2cb592d6196105ea2 100644 (file)
--- a/src/systemctl/systemctl-set-default.c
+++ b/src/systemctl/systemctl-set-default.c
@@ -31,7 +31,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
 
 static void emit_cmdline_warning(void) {
         if (arg_quiet || arg_root)
-                /* don't bother checking the commandline if we're operating on a container */
+                /* don't bother checking the command line if we're operating on a container */
                 return;
 
         _cleanup_free_ char *override = NULL;
@@ -41,7 +41,7 @@ static void emit_cmdline_warning(void) {
         if (r < 0)
                 log_debug_errno(r, "Failed to parse kernel command line, ignoring: %m");
         if (override)
-                log_notice("Note: found \"%s\" on the kernel commandline, which overrides the default unit.",
+                log_notice("Note: found \"%s\" on the kernel command line, which overrides the default unit.",
                            override);
 }
 

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 890a694e685fca7b1c773c4c1ce49cbe8969ac62..432dc87988d470e61bdbaf60d4d0297d25433633 100755 (executable)
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -1523,7 +1523,7 @@ def finalize_options(opts):
     elif opts.linux or opts.initrd:
         raise ValueError('--linux/--initrd options cannot be used with positional arguments')
     else:
-        print("Assuming obsolete commandline syntax with no verb. Please use 'build'.")
+        print("Assuming obsolete command line syntax with no verb. Please use 'build'.")
         if opts.positional:
             opts.linux = pathlib.Path(opts.positional[0])
         # If we have initrds from parsing config files, append our positional args at the end
@@ -1543,8 +1543,8 @@ def finalize_options(opts):
     if opts.cmdline and opts.cmdline.startswith('@'):
         opts.cmdline = pathlib.Path(opts.cmdline[1:])
     elif opts.cmdline:
-        # Drop whitespace from the commandline. If we're reading from a file,
-        # we copy the contents verbatim. But configuration specified on the commandline
+        # Drop whitespace from the command line. If we're reading from a file,
+        # we copy the contents verbatim. But configuration specified on the command line
         # or in the config file may contain additional whitespace that has no meaning.
         opts.cmdline = ' '.join(opts.cmdline.split())