summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--man/coredump.conf.xml2
-rw-r--r--man/custom-html.xsl2
-rw-r--r--man/machinectl.xml4
-rw-r--r--man/sd-bus-errors.xml4
-rw-r--r--man/sd_bus_message_append_array.xml8
-rw-r--r--man/sd_bus_negotiate_fds.xml2
-rw-r--r--man/systemd-coredump.xml4
-rw-r--r--man/systemd-journald.service.xml2
-rw-r--r--man/systemd.journal-fields.xml2
-rw-r--r--man/systemd.link.xml9
-rw-r--r--man/systemd.netdev.xml14
-rw-r--r--man/systemd.network.xml10
-rw-r--r--man/systemd.socket.xml2
-rw-r--r--src/boot/efi/boot.c17
14 files changed, 45 insertions, 37 deletions
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index fd54c59e6b..8e71f7d4ec 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -58,7 +58,7 @@
<refsect1>
<title>Description</title>
- <para>These files configure the behaviour of
+ <para>These files configure the behavior of
<citerefentry><refentrytitle>systemd-coredump</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
a handler for core dumps invoked by the kernel.</para>
</refsect1>
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index 151276362c..3e266e4a7f 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -125,7 +125,7 @@
<!--
- helper template to do conflict resolution between various headings with the same inferred ID attribute/tag from the headerlink template
- - this conflict resolution is necessary to prevent malformed HTML ouput (multiple id attributes with the same value)
+ - this conflict resolution is necessary to prevent malformed HTML output (multiple id attributes with the same value)
- and it fixes xsltproc warnings during compilation of HTML man pages
-
- A simple top-to-bottom numbering scheme is implemented for nodes with the same ID value to derive unique ID values for HTML output.
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 4b87870853..a5eb3f08e4 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -593,7 +593,7 @@
<filename>/var/lib/machines/</filename>, that is named after
the specified URL and its HTTP etag. A writable snapshot is
then taken from this subvolume, and named after the specified
- local name. This behaviour ensures that creating multiple
+ local name. This behavior ensures that creating multiple
container instances of the same URL is efficient, as multiple
downloads are not necessary. In order to create only the
read-only image, and avoid creating its writable snapshot,
@@ -639,7 +639,7 @@
machine name. To omit creation of the local, writable copy
pass <literal>-</literal> as local machine name.</para>
- <para>Similar to the behaviour of <command>pull-tar</command>,
+ <para>Similar to the behavior of <command>pull-tar</command>,
the read-only image is prefixed with
<filename>.raw-</filename>, and thus not shown by
<command>list-images</command>, unless <option>--all</option>
diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
index d6bbd7fbb2..a1e8462858 100644
--- a/man/sd-bus-errors.xml
+++ b/man/sd-bus-errors.xml
@@ -138,7 +138,7 @@
<term><varname>SD_BUS_ERROR_FAILED</varname></term>
<listitem><para>A generic error indication. See the error
message for further details. This error name should be
- avoided, in favour of a more expressive error
+ avoided, in favor of a more expressive error
name.</para></listitem>
</varlistentry>
@@ -186,7 +186,7 @@
</varlistentry>
<varlistentry>
<term><varname>SD_BUS_ERROR_ACCESS_DENIED</varname></term>
- <listitem><para>Access to a resource has bee denied, due to security restrictions.</para></listitem>
+ <listitem><para>Access to a resource has been denied, due to security restrictions.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>SD_BUS_ERROR_AUTH_FAILED</varname></term>
diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index 034466bf9c..37cadb9d0f 100644
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -49,7 +49,7 @@
<refname>sd_bus_message_append_array_iovec</refname>
<refname>sd_bus_message_append_array_space</refname>
- <refpurpose>Appaned an array of fields to a D-Bus
+ <refpurpose>Append an array of fields to a D-Bus
message</refpurpose>
</refnamediv>
@@ -125,7 +125,7 @@
<parameter>m</parameter>, similar to
<function>sd_bus_message_append_array()</function>. The contents
of the memory file descriptor <parameter>memfd</parameter>
- starting at the specified offset and and of the specified size is
+ starting at the specified offset and of the specified size is
used as the contents of the array. The offset and size must be a
multiple of the size of the type
<parameter>type</parameter>. However, as a special exception, if
@@ -173,7 +173,7 @@
<parameter>p</parameter>. The caller should subsequently write the
array contents to this memory. Modifications of the memory
pointed to should only occur until the next operation on the bus
- message is invoked, most imporantly the memory should not be
+ message is invoked, most importantly the memory should not be
altered anymore when another field has been added to the message
or the message has been sealed.</para>
</refsect1>
@@ -182,7 +182,7 @@
<title>Return Value</title>
<para>On success, these calls return 0 or a positive integer. On
- failure, they returns a negative errno-style error code.</para>
+ failure, they return a negative errno-style error code.</para>
</refsect1>
<xi:include href="sd_bus_message_append_basic.xml" xpointer="errors" />
diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index 1be44e2785..f53ea9e41a 100644
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -152,7 +152,7 @@
<refsect1>
<title>Return Value</title>
- <para>On success, these functions returns 0 or a
+ <para>On success, these functions return 0 or a
positive integer. On failure, they return a negative errno-style
error code.</para>
</refsect1>
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 5da3857c08..cb46d41902 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -67,7 +67,7 @@
overridden to use a different setting following normal
<citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> rules.</para>
- <para>The behaviour of a specific program upon reception of a
+ <para>The behavior of a specific program upon reception of a
signal is governed by a few factors which are described in detail
in <citerefentry project='man-pages'><refentrytitle>core</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
In particular, the coredump will only be processed when the
@@ -81,7 +81,7 @@
including a backtrace if possible, and store the core (contents of
process' memory contents) in an external file on disk in
<filename>/var/lib/systemd/coredump</filename>, or directly in
- the journal. This behaviour may be modified using
+ the journal. This behavior may be modified using
<citerefentry><refentrytitle>coredump.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>Apart from the
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 8280d6c874..dae6ee6042 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -203,7 +203,7 @@
<listitem><para>Configure
<command>systemd-journald</command>
- behaviour. See
+ behavior. See
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index afe1200d7e..49f44d2922 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -73,7 +73,7 @@
<para>The human-readable message string for this entry. This
is supposed to be the primary text shown to the user. It is
usually not translated (but might be in some cases), and is
- not supposed to be parsed for meta data.</para>
+ not supposed to be parsed for metadata.</para>
</listitem>
</varlistentry>
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index d9b1879c59..b630ef7a17 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -68,11 +68,10 @@
in <filename>/etc</filename> have the highest priority, files in
<filename>/run</filename> take precedence over files with the same
name in <filename>/usr/lib</filename>. This can be used to
- override a system-supplied link file with a local file if needed;
- a symlink in <filename>/etc</filename> with the same name as a
- link file in <filename>/usr/lib</filename>, pointing to
- <filename>/dev/null</filename>, disables the link file
- entirely.</para>
+ override a system-supplied link file with a local file if needed.
+ As a special case, an empty file (file size 0) or symlink with the
+ same name pointing to <filename>/dev/null</filename>, disable the
+ configuration file entirely (it is "masked").</para>
<para>The link file contains a <literal>[Match]</literal> section,
which determines if a given link file may be applied to a given
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 7e92d1d99c..6287a00f9d 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -80,11 +80,9 @@
<filename>/run</filename> take precedence over files with the same
name in <filename>/usr/lib</filename>. This can be used to
override a system-supplied configuration file with a local file if
- needed; a symlink in <filename>/etc</filename> with the same name
- as a configuration file in <filename>/usr/lib</filename>, pointing
- to <filename>/dev/null</filename>, disables the configuration file
- entirely.</para>
-
+ needed. As a special case, an empty file (file size 0) or symlink
+ with the same name pointing to <filename>/dev/null</filename>,
+ disable the configuration file entirely (it is "masked").</para>
</refsect1>
<refsect1>
@@ -500,7 +498,7 @@
A Flow Label of zero is used to indicate packets that have
not been labeled. Takes following values.
When <literal>inherit</literal> it uses the original flowlabel,
- or can be configured to any value betwen 0 to 0xFFFFF.</para>
+ or can be configured to any value between 0 to 0xFFFFF.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -679,7 +677,7 @@
<listitem>
<para>Specifies the frequency that Media Independent
Interface link monitoring will occur. A value of zero
- disables MII link monitoring. This values is rounded down to
+ disables MII link monitoring. This value is rounded down to
the nearest millisecond. The default value is 0.</para>
</listitem>
</varlistentry>
@@ -823,7 +821,7 @@
<listitem>
<para> Specify the number of packets to transmit through a slave before
moving to the next one. When set to 0 then a slave is chosen at
- random.The valid range is (0 - 65535). Defaults to 1. This option
+ random. The valid range is (0 - 65535). Defaults to 1. This option
has effect only in balance-rr mode.
</para>
</listitem>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index fbb0bef5c2..e44491cc2e 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -76,11 +76,9 @@
<filename>/run</filename> take precedence over files with the same
name in <filename>/usr/lib</filename>. This can be used to
override a system-supplied configuration file with a local file if
- needed; a symlink in <filename>/etc</filename> with the same name
- as a configuration file in <filename>/usr/lib</filename>, pointing
- to <filename>/dev/null</filename>, disables the configuration file
- entirely.</para>
-
+ needed. As a special case, an empty file (file size 0) or symlink
+ with the same name pointing to <filename>/dev/null</filename>,
+ disable the configuration file entirely (it is "masked").</para>
</refsect1>
<refsect1>
@@ -288,7 +286,7 @@
<term><varname>BindCarrier=</varname></term>
<listitem>
<para>A port or a list of ports. When set, controls the
- behaviour of the current interface. When all ports in the list
+ behavior of the current interface. When all ports in the list
are in an operational down state, the current interface is brought
down. When at least one port has carrier, the current interface
is brought up.
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1e9778bc2a..36fa3a86be 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -462,7 +462,7 @@
and the kernel will ignore initial ACK packets without any
data. The argument specifies the approximate amount of time
the kernel should wait for incoming data before falling back
- to the normal behaviour of honouring empty ACK packets. This
+ to the normal behavior of honouring empty ACK packets. This
option is beneficial for protocols where the client sends the
data first (e.g. HTTP, in contrast to SMTP), because the
server process will not be woken up unnecessarily before it
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 827c11844c..e8cd8abd26 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1495,6 +1495,7 @@ static VOID config_entry_add_osx(Config *config) {
static VOID config_entry_add_linux( Config *config, EFI_LOADED_IMAGE *loaded_image, EFI_FILE *root_dir) {
EFI_FILE_HANDLE linux_dir;
EFI_STATUS err;
+ ConfigEntry *entry;
err = uefi_call_wrapper(root_dir->Open, 5, root_dir, &linux_dir, L"\\EFI\\Linux", EFI_FILE_MODE_READ, 0ULL);
if (!EFI_ERROR(err)) {
@@ -1504,6 +1505,7 @@ static VOID config_entry_add_linux( Config *config, EFI_LOADED_IMAGE *loaded_ima
EFI_FILE_INFO *f;
CHAR8 *sections[] = {
(UINT8 *)".osrel",
+ (UINT8 *)".cmdline",
NULL
};
UINTN offs[ELEMENTSOF(sections)-1] = {};
@@ -1535,7 +1537,7 @@ static VOID config_entry_add_linux( Config *config, EFI_LOADED_IMAGE *loaded_ima
if (StriCmp(f->FileName + len - 4, L".efi") != 0)
continue;
- /* look for an .osrel section in the .efi binary */
+ /* look for .osrel and .cmdline sections in the .efi binary */
err = pefile_locate_sections(linux_dir, f->FileName, sections, addrs, offs, szs);
if (EFI_ERROR(err))
continue;
@@ -1575,10 +1577,21 @@ static VOID config_entry_add_linux( Config *config, EFI_LOADED_IMAGE *loaded_ima
if (os_name && os_id && (os_version || os_build)) {
CHAR16 *conf;
CHAR16 *path;
+ CHAR16 *cmdline;
conf = PoolPrint(L"%s-%s", os_id, os_version ? : os_build);
path = PoolPrint(L"\\EFI\\Linux\\%s", f->FileName);
- config_entry_add_loader(config, loaded_image->DeviceHandle, LOADER_LINUX, conf, 'l', os_name, path);
+ entry = config_entry_add_loader(config, loaded_image->DeviceHandle, LOADER_LINUX, conf, 'l', os_name, path);
+
+ FreePool(content);
+ /* read the embedded cmdline file */
+ len = file_read(linux_dir, f->FileName, offs[1], szs[1] - 1 , &content);
+ if (len > 0) {
+ cmdline = stra_to_str(content);
+ entry->options = cmdline;
+ cmdline = NULL;
+ }
+ FreePool(cmdline);
FreePool(conf);
FreePool(path);
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-06 19:30:24 +0000