* A new ConditionOSRelease= setting has been added to unit files to
check os-release(5) fields. The "=", "!=", "<", "<=", ">=", ">"
operators may be used to check if some field has some specific value
- or do a aphanumerical comparison. Equality comparisons are useful for
- fields like ID, but relative comparisons for fields like VERSION_ID
- or IMAGE_VERSION.
+ or do an alphanumerical comparison. Equality comparisons are useful
+ for fields like ID, but relative comparisons for fields like
+ VERSION_ID or IMAGE_VERSION.
* hostnamed gained a new Describe() D-Bus method that returns a JSON
serialization of the host data it exposes. This is exposed via
all system calls known at the time systemd was built.
* Behaviour of system call filter allow lists has changed slightly:
- system calls that are contained in @known will result in a EPERM by
+ system calls that are contained in @known will result in EPERM by
default, while those not contained in it result in ENOSYS. This
should improve compatibility because known system calls will thus be
communicated as prohibited, while unknown (and thus newer ones) will
* sd-id128 gained a new API for generating unique IDs for the host in a
way that does not leak the machine ID. Specifically,
sd_id128_get_machine_app_specific() derives an ID based on the
- machine ID a in well-defined, non-reversible, stable way. This is
+ machine ID in a well-defined, non-reversible, stable way. This is
useful whenever an identifier for the host is needed but where the
identifier shall not be useful to identify the system beyond the
scope of the application itself. (Internally this uses HMAC-SHA256 as
* udev will no longer create device symlinks for all block devices by
default. A deny list for excluding special block devices from this
- logic has been turned into a allow list that requires picking block
+ logic has been turned into an allow list that requires picking block
devices explicitly that require device symlinks.
* A new (currently still internal) API sd-device.h has been
Note that this change in behavior is a good idea in any case, and does not
create any dependencies on `systemd-homed` or systemd-specific APIs. It's
simply a change of behavior regarding use of existing APIs, not a suggested
-hook-up to a any new API.
+hook-up to any new APIs.
A display manager which supports this kind of out-of-context screen lock
operation needs to inform systemd-homed about this so that systemd-homed knows
The following fields are defined in this section:
-`matchMachineId` → An array of strings with each a formatted 128bit ID in
+`matchMachineId` → An array of strings that are formatted 128bit IDs in
hex. If any of the specified IDs match the system's local machine ID
(i.e. matches `/etc/machine-id`) the fields in this object are honored.
-`matchHostname` → An array of string with a each a valid hostname. If any of
+`matchHostname` → An array of strings that are valid hostnames. If any of
the specified hostnames match the system's local hostname, the fields in this
object are honored. If both `matchHostname` and `matchMachineId` are used
within the same array entry, the object is honored when either match succeeds,
<varlistentry>
<term><command>emit</command> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>SIGNAL</replaceable></arg> <arg choice="opt"><replaceable>SIGNATURE</replaceable> <arg choice="opt" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></arg></term>
- <listitem><para>Emit a signal. Takes a object path, interface name and method name. If parameters
+ <listitem><para>Emit a signal. Takes an object path, interface name and method name. If parameters
shall be passed, a signature string is required, followed by the arguments, individually formatted as
strings. For details on the formatting used, see below. To specify the destination of the signal,
use the <option>--destination=</option> option.</para></listitem>
<para><function>sd_bus_set_fd()</function> sets the file descriptors used to communicate by a bus
connection object. Both <parameter>input_fd</parameter> and <parameter>output_fd</parameter> must be
valid file descriptors, referring to stream-based file objects (e.g. a stream socket, a pair of pipes or
- FIFOs, or
a even a TTY device). <parameter>input_fd</parameter> must be readable, and
+ FIFOs, or even a TTY device). <parameter>input_fd</parameter> must be readable, and
<parameter>output_fd</parameter> must be writable. The same file descriptor may be used (and typically is
used) as both the input and the output file descriptor. This function must be called before the bus
connection is started via
<varlistentry>
<term><constant>-ENOEXEC</constant></term>
- <listitem><para><function>sd_event_source_get_ratelimit()</function> was called on a event source
+ <listitem><para><function>sd_event_source_get_ratelimit()</function> was called on an event source
that doesn't have rate limiting configured.</para></listitem>
</varlistentry>
<varlistentry id='property'>
<term><varname>Property=</varname></term>
<listitem>
- <para>A whitespace-separated list of udev property name with its value after a equal
+ <para>A whitespace-separated list of udev property names with their values after equals sign
(<literal>=</literal>). If multiple properties are specified, the test results are ANDed.
If the list is prefixed with a "!", the test is inverted. If a value contains white
spaces, then please quote whole key and value pair. If a value contains quotation, then
<varlistentry>
<term><varname>KeyFile=</varname></term>
<listitem>
- <para>Takes a absolute path to a file which contains a 128-bit key encoded in a hexadecimal string,
+ <para>Takes an absolute path to a file which contains a 128-bit key encoded in a hexadecimal string,
which will be used in the transmission channel. When this option is specified,
<varname>Key=</varname> is ignored. Note that the file must be readable by the user
<literal>systemd-network</literal>, so it should be, e.g., owned by
<term><varname>VXLAN=</varname></term>
<term><varname>Xfrm=</varname></term>
<listitem>
- <para>The name of a IPVLAN, IPVTAP, L2TP, MACsec, MACVLAN, MACVTAP, tunnel, VLAN, VXLAN, or
+ <para>The name of an IPVLAN, IPVTAP, L2TP, MACsec, MACVLAN, MACVTAP, tunnel, VLAN, VXLAN, or
Xfrm to be created on the link. See
<citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
This option may be specified more than once.</para>
<varlistentry>
<term><varname>VirtualQueues=</varname></term>
<listitem>
- <para>Specifies the number of virtual queues. Takes a integer in the range 1…16. Defaults to unset
+ <para>Specifies the number of virtual queues. Takes an integer in the range 1…16. Defaults to unset
and kernel's default is used.</para>
</listitem>
</varlistentry>
'--private-network[Disconnect networking of the container from the host.]' \
'--network-interface=[Assign the specified network interface to the container.]: : _net_interfaces' \
'--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]: : _net_interfaces' \
- '--network-ipvlan=[Create a ipvlan network interface based on an existing network interface to the container.]: : _net_interfaces' \
+ '--network-ipvlan=[Create an "ipvlan" network interface based on an existing network interface to the container.]: : _net_interfaces' \
{--network-veth,-n}'[Create a virtual Ethernet link (veth) between host and container.]' \
'--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]: : _net_interfaces' \
{--port=,-p+}'[Expose a container IP port on the host.]: : _message port' \
if (flags & (CONF_FILES_REGULAR|CONF_FILES_DIRECTORY))
if (!((flags & CONF_FILES_DIRECTORY) && S_ISDIR(st.st_mode)) &&
!((flags & CONF_FILES_REGULAR) && S_ISREG(st.st_mode))) {
- log_debug("Ignoring '%s/%s', as it is not a of the right type.", dirpath, de->d_name);
+ log_debug("Ignoring '%s/%s', as it does not have the right type.", dirpath, de->d_name);
continue;
}
assert_cc(IDX_FIRST == _IDX_ITERATOR_FIRST);
/* Storage space for the "swap" buckets.
- * All entry types can fit into a ordered_hashmap_entry. */
+ * All entry types can fit into an ordered_hashmap_entry. */
struct swap_entries {
struct ordered_hashmap_entry e[_IDX_SWAP_END - _IDX_SWAP_BEGIN];
};
return hashmap_remove_and_replace(PLAIN_HASHMAP(h), old_key, new_key, value);
}
-/* Since merging data from a OrderedHashmap into a Hashmap or vice-versa
+/* Since merging data from an OrderedHashmap into a Hashmap or vice-versa
* should just work, allow this by having looser type-checking here. */
int _hashmap_merge(Hashmap *h, Hashmap *other);
#define hashmap_merge(h, other) _hashmap_merge(PLAIN_HASHMAP(h), PLAIN_HASHMAP(other))
rt = hashmap_get(m->exec_runtime_by_id, id);
if (rt)
- /* We already have a ExecRuntime object, let's increase the ref count and reuse it */
+ /* We already have an ExecRuntime object, let's increase the ref count and reuse it */
goto ref;
if (!create) {
/* Allow nothing but the ones listed */
c->syscall_allow_list = true;
- /* Accept default syscalls if we are on a allow_list */
+ /* Accept default syscalls if we are on an allow_list */
r = seccomp_parse_syscall_filter(
"@default", -1, c->syscall_filter,
SECCOMP_PARSE_PERMISSIVE|SECCOMP_PARSE_ALLOW_LIST,
int r;
if (!is_efi_boot()) {
- log_debug("Not a EFI boot, not creating root mount.");
+ log_debug("Not an EFI boot, not creating root mount.");
return 0;
}
* udev_enumerate_ref:
* @udev_enumerate: context
*
- * Take a reference of a enumeration context.
+ * Take a reference of an enumeration context.
*
* Returns: the passed enumeration context
**/
* this is != 0 and encodes what is being done */
InhibitWhat action_what;
- /* If a shutdown/suspend was delayed due to a inhibitor this
+ /* If a shutdown/suspend was delayed due to an inhibitor this
contains the unit name we are supposed to start after the
delay is over */
const char *action_unit;
return 1;
}
-/* send a request to the kernel to add a IPv6 Proxy entry to the neighbour table */
+/* send a request to the kernel to add an IPv6 Proxy entry to the neighbour table */
static int ipv6_proxy_ndp_address_configure(
const struct in6_addr *address,
Link *link,
" Create a macvlan network interface based on an\n"
" existing network interface to the container\n"
" --network-ipvlan=INTERFACE\n"
- " Create a ipvlan network interface based on an\n"
+ " Create an ipvlan network interface based on an\n"
" existing network interface to the container\n"
" -n --network-veth Add a virtual Ethernet connection between host\n"
" and container\n"
DNS_SERVER_FEATURE_LEVEL_IS_DNSSEC(s->possible_feature_level) &&
dns_server_get_dnssec_mode(s) != DNSSEC_YES) {
- /* RRSIG data was missing on a EDNS0 packet with DO bit set. This means the server
+ /* RRSIG data was missing on an EDNS0 packet with DO bit set. This means the server
* doesn't augment responses with DNSSEC RRs. If so, let's better not ask the server
* for it anymore, after all some servers generate different replies depending if an
* OPT RR is in the query or not. If we are in strict DNSSEC mode, don't allow such
enum {
BUS_MAP_STRDUP = 1 << 0, /* If set, each "s" message is duplicated. Thus, each pointer needs to be freed. */
- BUS_MAP_BOOLEAN_AS_BOOL = 1 << 1, /* If set, each "b" message is written to a bool pointer. If not set, "b" is written to a int pointer. */
+ BUS_MAP_BOOLEAN_AS_BOOL = 1 << 1, /* If set, each "b" message is written to a bool pointer. If not set, "b" is written to an int pointer. */
};
int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata);
/*
* Ideally there would be an API that provides:
*
- * 1) a init function to add the main ruleset skeleton
+ * 1) an init function to add the main ruleset skeleton
* 2) a function that populates the sets with all known address/port pairs to s/dnat for
* 3) a function that can remove address/port pairs again.
*
assert(t);
- /* A all-in-one solution for showing tables, and turning on a pager first. Also optionally suppresses
+ /* An all-in-one solution for showing tables, and turning on a pager first. Also optionally suppresses
* the table header and logs about any error. */
if (json_format_flags & (JSON_FORMAT_OFF|JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO))
}
if (!json_variant_is_unsigned(variant))
- return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a integer.", strna(name));
+ return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name));
k = json_variant_unsigned(variant);
if (k > UINT32_MAX || !uid_is_valid(k))
}
if (!json_variant_is_unsigned(variant))
- return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a integer.", strna(name));
+ return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name));
k = json_variant_unsigned(variant);
if (k <= 0 || k >= UINT64_MAX)
}
if (!json_variant_is_unsigned(variant))
- return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a integer.", strna(name));
+ return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name));
k = json_variant_unsigned(variant);
if (k <= CGROUP_WEIGHT_MIN || k >= CGROUP_WEIGHT_MAX)
if (!changed && umount_log_level == LOG_INFO && !can_initrd) {
/* There are things we cannot get rid of. Loop one more time
* with LOG_ERR to inform the user. Note that we don't need
- * to do this if there is a initrd to switch to, because that
+ * to do this if there is an initrd to switch to, because that
* one is likely to get rid of the remaining mounts. If not,
* it will log about them. */
umount_log_level = LOG_ERR;
if (!resolved_id)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
- "[%s:%u] Lines of type 'r' require a ID range in the third field.",
+ "[%s:%u] Lines of type 'r' require an ID range in the third field.",
fname, line);
if (description || home || shell)
/*
* To be able to ask on all terminal devices of /dev/console the devices are collected. If more than one
- * device is found, then on each of the terminals a inquiring task is forked. Every task has its own session
+ * device is found, then on each of the terminals an inquiring task is forked. Every task has its own session
* and its own controlling terminal. If one of the tasks does handle a password, the remaining tasks will be
* terminated.
*/
* disk_identify:
* @fd: File descriptor for the block device.
* @out_identify: Return location for IDENTIFY data.
- * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE.
+ * @out_is_packet_device: Return location for whether returned data is from an IDENTIFY PACKET DEVICE.
*
* Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the
* device represented by @fd. If successful, then the result will be
projects / thirdparty / systemd.git / commitdiff
