Merge pull request #10925 from yuwata/sd-boot-fixes
sd-boot: fixes trailing whitespace trimming and updates document
This commit is contained in:
commit
91419787f0
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
<refsynopsisdiv>
|
<refsynopsisdiv>
|
||||||
<para><filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>,
|
<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>
|
</para>
|
||||||
</refsynopsisdiv>
|
</refsynopsisdiv>
|
||||||
|
|
||||||
|
@ -32,9 +32,9 @@
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
<citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
<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
|
<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>
|
||||||
|
|
||||||
<para>Each configuration file must consist of an option name, followed by
|
<para>Each configuration file must consist of an option name, followed by
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
<refsect1>
|
<refsect1>
|
||||||
<title>Options</title>
|
<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>
|
<variablelist>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -981,7 +981,7 @@ skip:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* remove trailing whitespace */
|
/* remove trailing whitespace */
|
||||||
while (linelen > 0 && strchra(sep, line[linelen-1]))
|
while (linelen > 0 && strchra((CHAR8 *)" \t", line[linelen-1]))
|
||||||
linelen--;
|
linelen--;
|
||||||
line[linelen] = '\0';
|
line[linelen] = '\0';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue