]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
man: systemd-boot does not read loader.conf.d/*.conf 10925/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 25 Nov 2018 21:58:28 +0000 (06:58 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 25 Nov 2018 21:58:31 +0000 (06:58 +0900)
Fixes #10923.

man/loader.conf.xml

index 6f8d0489d283affeb80ea188b71ef6b2dea1caf2..f9d98dd4d93cb5d55452e7dd329a0dfd4dc62ae5 100644 (file)
@@ -23,7 +23,7 @@
 
   <refsynopsisdiv>
     <para><filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>,
-    <filename><replaceable>ESP</replaceable>/loader/loader.conf.d/*.conf</filename>
+    <filename><replaceable>ESP</replaceable>/loader/entries/*.conf</filename>
     </para>
   </refsynopsisdiv>
 
@@ -32,9 +32,9 @@
 
     <para>
     <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-    will read <filename>/loader/loader.conf</filename> and any files with the
+    will read <filename><replaceable>ESP</replaceable>/loader/loader.conf</filename> and any files with the
     <literal>.conf</literal> extension under
-    <filename>/loader/loader.conf.d/</filename> on the EFI system partition (ESP).
+    <filename><replaceable>ESP</replaceable>/loader/entries/</filename> on the EFI system partition (ESP).
     </para>
 
     <para>Each configuration file must consist of an option name, followed by
@@ -50,7 +50,7 @@
   <refsect1>
     <title>Options</title>
 
-    <para>The following configuration options are understood:</para>
+    <para>The following configuration options in <filename>loader.conf</filename> are understood:</para>
 
     <variablelist>
       <varlistentry>