tree-wide: use "_" rather than "-" as separator in kernel cmdline options

Most of our kernel cmdline options use underscores as word separators in
kernel cmdline options, but there were some exceptions. Let's fix those,
and also use underscores.

Since our /proc/cmdline parsers don't distinguish between the two
characters anyway this should not break anything, but makes sure our own
codebase (and in particular docs and log messages) are internally
consistent.

7 files changed, 17 insertions, 17 deletions

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index d4b005f876..2a951eeea9 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -317,7 +317,7 @@
         <term><varname>udev.blockdev_read_only</varname></term>
         <term><varname>rd.udev.blockdev_read_only</varname></term>
         <term><varname>net.ifnames=</varname></term>
-        <term><varname>net.naming-scheme=</varname></term>
+        <term><varname>net.naming_scheme=</varname></term>
 
         <listitem>
           <para>Parameters understood by the device event managing
@@ -609,7 +609,7 @@
         <citerefentry><refentrytitle>systemd-homed-firstboot.service</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         will not query the user for basic system settings, even if the system boots up for the first time and
         the relevant settings are not initialized yet. Not to be confused with
-        <varname>systemd.condition-first-boot=</varname> (see below), which overrides the result of the
+        <varname>systemd.condition_first_boot=</varname> (see below), which overrides the result of the
         <varname>ConditionFirstBoot=</varname> unit file condition, and thus controls more than just
         <filename>systemd-firstboot.service</filename> behaviour.</para>
 
@@ -617,7 +617,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>systemd.condition-needs-update=</varname></term>
+        <term><varname>systemd.condition_needs_update=</varname></term>
 
         <listitem><para>Takes a boolean argument. If specified, overrides the result of
         <varname>ConditionNeedsUpdate=</varname> unit condition checks. See
@@ -628,7 +628,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>systemd.condition-first-boot=</varname></term>
+        <term><varname>systemd.condition_first_boot=</varname></term>
 
         <listitem><para>Takes a boolean argument. If specified, overrides the result of
         <varname>ConditionFirstBoot=</varname> unit condition checks. See
@@ -641,7 +641,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>systemd.clock-usec=</varname></term>
+        <term><varname>systemd.clock_usec=</varname></term>
 
         <listitem><para>Takes a decimal, numeric timestamp in μs since January 1st 1970, 00:00am, to set the
         system clock to. The system time is set to the specified timestamp early during boot. It is not
@@ -651,7 +651,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>systemd.random-seed=</varname></term>
+        <term><varname>systemd.random_seed=</varname></term>
 
         <listitem><para>Takes a base64 encoded random seed value to credit with full entropy to the kernel's
         random pool during early service manager initialization. This option is useful in testing
diff --git a/man/systemd-battery-check.service.xml b/man/systemd-battery-check.service.xml
index 698e9d7c3f..a5f564b888 100644
--- a/man/systemd-battery-check.service.xml
+++ b/man/systemd-battery-check.service.xml
@@ -66,7 +66,7 @@
 
     <variablelist class='kernel-commandline-options'>
       <varlistentry>
-        <term><varname>systemd.battery-check=<replaceable>BOOL</replaceable></varname></term>
+        <term><varname>systemd.battery_check=<replaceable>BOOL</replaceable></varname></term>
 
         <listitem>
           <para>Takes a boolean. If specified with false, <command>systemd-battery-check</command> command
diff --git a/man/systemd-network-generator.service.xml b/man/systemd-network-generator.service.xml
index 1d498cbf1d..59d608028a 100644
--- a/man/systemd-network-generator.service.xml
+++ b/man/systemd-network-generator.service.xml
@@ -76,7 +76,7 @@
 
       <varlistentry>
         <term><varname>ifname=</varname></term>
-        <term><varname>net.ifname-policy=</varname></term>
+        <term><varname>net.ifname_policy=</varname></term>
         <listitem>
           <para>Translated into
           <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index b63ee4bb77..c781765e1c 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -236,7 +236,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>net.naming-scheme=</varname></term>
+        <term><varname>net.naming_scheme=</varname></term>
         <listitem>
           <para>Network interfaces are renamed to give them predictable names when possible (unless
           <varname>net.ifnames=0</varname> is specified, see above). With this kernel command line option it
@@ -255,7 +255,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>net.ifname-policy=<replaceable>policy1</replaceable>[,<replaceable>policy2</replaceable>,…][,<replaceable>MAC</replaceable>]</varname></term>
+        <term><varname>net.ifname_policy=<replaceable>policy1</replaceable>[,<replaceable>policy2</replaceable>,…][,<replaceable>MAC</replaceable>]</varname></term>
         <listitem>
           <para>Specifies naming policies applied when renaming network interfaces. Takes a list of
           policies and an optional MAC address separated with comma. Each policy value must be one of
@@ -273,8 +273,8 @@
           enabled.</para>
 
           <para>Example:
-          <programlisting>net.ifname-policy=keep,kernel,path,slot,onboard,01:23:45:67:89:ab
-net.ifname-policy=keep,kernel,path,slot,onboard,mac</programlisting>
+          <programlisting>net.ifname_policy=keep,kernel,path,slot,onboard,01:23:45:67:89:ab
+net.ifname_policy=keep,kernel,path,slot,onboard,mac</programlisting>
           This is mostly equivalent to creating the following .link files:
           <programlisting># 91-name-policy-with-mac.link
 [Match]
diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index 46bb2f41c8..6b863ecff3 100644
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml
@@ -58,7 +58,7 @@
     <citerefentry project='man-pages'><refentrytitle>touch</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     on it.</para>
 
-    <para>Note that if the <varname>systemd.condition-needs-update=</varname> kernel command line option is
+    <para>Note that if the <varname>systemd.condition_needs_update=</varname> kernel command line option is
     used it overrides the <varname>ConditionNeedsUpdate=</varname> unit condition checks. In that case
     <filename>systemd-update-done.service</filename> will not reset the condition state until a follow-up
     reboot where the kernel switch is not specified anymore.</para>
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
index 09df42aea2..2fec1055b7 100644
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
@@ -38,7 +38,7 @@
     implemented version, but it is also possible to set one of the older versions to preserve
     compatibility. This may be useful for example for distributions, which may introduce new versions of
     systemd in stable releases without changing the naming scheme. The naming scheme may also be overridden
-    using the <varname>net.naming-scheme=</varname> kernel command line switch, see
+    using the <varname>net.naming_scheme=</varname> kernel command line switch, see
     <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
     Available naming schemes are described below.</para>
 
@@ -326,7 +326,7 @@
     <title>History</title>
 
     <para>The following "naming schemes" have been defined (which may be chosen at system boot-up time via
-    the <varname>net.naming-scheme=</varname> kernel command line switch, see above):</para>
+    the <varname>net.naming_scheme=</varname> kernel command line switch, see above):</para>
 
     <variablelist>
         <varlistentry>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 46184f5b7e..7c11598a94 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1624,7 +1624,7 @@
           to make sure they run before the stamp file's modification time gets reset indicating a completed
           update.</para>
 
-          <para>If the <varname>systemd.condition-needs-update=</varname> option is specified on the kernel
+          <para>If the <varname>systemd.condition_needs_update=</varname> option is specified on the kernel
           command line (taking a boolean), it will override the result of this condition check, taking
           precedence over any file modification time checks. If the kernel command line option is used,
           <filename>systemd-update-done.service</filename> will not have immediate effect on any following
@@ -1673,7 +1673,7 @@
           <varname>Wants=</varname>. This ensures that in a case of an aborted first boot, these units will
           be re-run during the next system startup.</para>
 
-          <para>If the <varname>systemd.condition-first-boot=</varname> option is specified on the kernel
+          <para>If the <varname>systemd.condition_first_boot=</varname> option is specified on the kernel
           command line (taking a boolean), it will override the result of this condition check, taking
           precedence over <filename>/etc/machine-id</filename> existence checks.</para>