Compare commits

..

No commits in common. "1b97c5cba58fdd1138e7622d7edef9a48309b0e2" and "ddd6dd9f2398c01f69acf163bfdedf161d7cea0d" have entirely different histories.

8 changed files with 27 additions and 36 deletions

View File

@ -357,11 +357,11 @@
<listitem><para>Takes a path to a Linux <literal>hidraw</literal> device <listitem><para>Takes a path to a Linux <literal>hidraw</literal> device
(e.g. <filename>/dev/hidraw1</filename>), referring to a FIDO2 security token implementing the (e.g. <filename>/dev/hidraw1</filename>), referring to a FIDO2 security token implementing the
<literal>hmac-secret</literal> extension that shall be able to unlock the user account. A random salt <literal>hmac-secret</literal> extension, that shall be able to unlock the user account. If used, a
value is generated on the host and passed to the FIDO2 device, which calculates a HMAC hash of the random salt value is generated on the host, which is passed to the FIDO2 device, which calculates a
salt using an internal secret key. The result is then used as the key to unlock the user account. The HMAC hash of it, keyed by its internal secret key. The result is then used as key for unlocking the
random salt is included in the user record, so that whenever authentication is needed it can be user account. The random salt is included in the user record, so that whenever authentication is
passed to the FIDO2 token again.</para> needed it can be passed again to the FIDO2 token, to retrieve the actual key.</para>
<para>Instead of a valid path to a FIDO2 <literal>hidraw</literal> device the special strings <para>Instead of a valid path to a FIDO2 <literal>hidraw</literal> device the special strings
<literal>list</literal> and <literal>auto</literal> may be specified. If <literal>list</literal> is <literal>list</literal> and <literal>auto</literal> may be specified. If <literal>list</literal> is

View File

@ -125,16 +125,16 @@
<term><varname>KillOnlyUsers=</varname></term> <term><varname>KillOnlyUsers=</varname></term>
<term><varname>KillExcludeUsers=</varname></term> <term><varname>KillExcludeUsers=</varname></term>
<listitem><para>These settings take space-separated lists of usernames that override the <listitem><para>These settings take space-separated lists of usernames that override
<varname>KillUserProcesses=</varname> setting. A user name may be added to the <varname>KillUserProcesses=</varname> setting. A user name may be added to
<varname>KillExcludeUsers=</varname> to exclude the processes in the session scopes of that user from <varname>KillExcludeUsers=</varname> to exclude the processes in the session scopes of
being killed even if <varname>KillUserProcesses=yes</varname> is set. If that user from being killed even if <varname>KillUserProcesses=yes</varname> is set. If
<varname>KillExcludeUsers=</varname> is not set, the <literal>root</literal> user is excluded by <varname>KillExcludeUsers=</varname> is not set, the <literal>root</literal> user is
default. <varname>KillExcludeUsers=</varname> may be set to an empty value to override this excluded by default. <varname>KillExcludeUsers=</varname> may be set to an empty value
default. If a user is not excluded, <varname>KillOnlyUsers=</varname> is checked next. If this to override this default. If a user is not excluded, <varname>KillOnlyUsers=</varname>
setting is specified, only the processes in the session scopes of those users will be is checked next. If this setting is specified, only the session scopes of those users
killed. Otherwise, users are subject to the <varname>KillUserProcesses=yes</varname> setting. will be killed. Otherwise, users are subject to the
</para></listitem> <varname>KillUserProcesses=yes</varname> setting.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

View File

@ -62,7 +62,7 @@
</thead> </thead>
<tbody> <tbody>
<row> <row>
<entry valign="top" morerows="13">VM</entry> <entry valign="top" morerows="12">VM</entry>
<entry><varname>qemu</varname></entry> <entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization, without KVM</entry> <entry>QEMU software virtualization, without KVM</entry>
</row> </row>
@ -92,11 +92,6 @@
<entry>Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems), for legacy and KVM hypervisor</entry> <entry>Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems), for legacy and KVM hypervisor</entry>
</row> </row>
<row>
<entry><varname>powervm</varname></entry>
<entry>IBM PowerVM hypervisor - comes as firmware with some IBM POWER servers</entry>
</row>
<row> <row>
<entry><varname>xen</varname></entry> <entry><varname>xen</varname></entry>
<entry>Xen hypervisor (only domU, not dom0)</entry> <entry>Xen hypervisor (only domU, not dom0)</entry>

View File

@ -711,16 +711,20 @@
<varlistentry> <varlistentry>
<term><varname>DestinationPort=</varname></term> <term><varname>DestinationPort=</varname></term>
<listitem> <listitem>
<para>Configures the default destination UDP port. If the destination port is not specified then <para>Configures the default destination UDP port on a per-device basis.
Linux kernel default will be used. Set to 4789 to get the IANA assigned value.</para> If destination port is not specified then Linux kernel default will be used.
Set destination port 4789 to get the IANA assigned value. If not set or if the
destination port is assigned the empty string the default port of 4789 is used.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>PortRange=</varname></term> <term><varname>PortRange=</varname></term>
<listitem> <listitem>
<para>Configures the source port range for the VXLAN. The kernel assigns the source UDP port based <para>Configures VXLAN port range. VXLAN bases source
on the flow to help the receiver to do load balancing. When this option is not set, the normal UDP port based on flow to help the receiver to be able
range of local UDP ports is used.</para> to load balance based on outer header flow. It
restricts the port range to the normal UDP local
ports, and allows overriding via configuration.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

View File

@ -1160,7 +1160,6 @@
<literal>vmware</literal>, <literal>vmware</literal>,
<literal>microsoft</literal>, <literal>microsoft</literal>,
<literal>oracle</literal>, <literal>oracle</literal>,
<literal>powervm</literal>,
<literal>xen</literal>, <literal>xen</literal>,
<literal>bochs</literal>, <literal>bochs</literal>,
<literal>uml</literal>, <literal>uml</literal>,

View File

@ -93,11 +93,6 @@ static int detect_vm_device_tree(void) {
_cleanup_closedir_ DIR *dir = NULL; _cleanup_closedir_ DIR *dir = NULL;
struct dirent *dent; struct dirent *dent;
if (access("/proc/device-tree/ibm,partition-name", F_OK) == 0 &&
access("/proc/device-tree/hmc-managed?", F_OK) == 0 &&
access("/proc/device-tree/chosen/qemu,graphic-width", F_OK) != 0)
return VIRTUALIZATION_POWERVM;
dir = opendir("/proc/device-tree"); dir = opendir("/proc/device-tree");
if (!dir) { if (!dir) {
if (errno == ENOENT) { if (errno == ENOENT) {
@ -684,7 +679,6 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
[VIRTUALIZATION_BHYVE] = "bhyve", [VIRTUALIZATION_BHYVE] = "bhyve",
[VIRTUALIZATION_QNX] = "qnx", [VIRTUALIZATION_QNX] = "qnx",
[VIRTUALIZATION_ACRN] = "acrn", [VIRTUALIZATION_ACRN] = "acrn",
[VIRTUALIZATION_POWERVM] = "powervm",
[VIRTUALIZATION_VM_OTHER] = "vm-other", [VIRTUALIZATION_VM_OTHER] = "vm-other",
[VIRTUALIZATION_SYSTEMD_NSPAWN] = "systemd-nspawn", [VIRTUALIZATION_SYSTEMD_NSPAWN] = "systemd-nspawn",

View File

@ -22,7 +22,6 @@ enum {
VIRTUALIZATION_BHYVE, VIRTUALIZATION_BHYVE,
VIRTUALIZATION_QNX, VIRTUALIZATION_QNX,
VIRTUALIZATION_ACRN, VIRTUALIZATION_ACRN,
VIRTUALIZATION_POWERVM,
VIRTUALIZATION_VM_OTHER, VIRTUALIZATION_VM_OTHER,
VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER, VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,

View File

@ -45,12 +45,12 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set **settle_s
r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER);
if (r < 0) { if (r < 0) {
bool ignore = IN_SET(r, -ENOENT, -ENODEV); bool ignore = r == -ENOENT;
log_full_errno(ignore ? LOG_DEBUG : LOG_ERR, r, log_full_errno(ignore ? LOG_DEBUG : LOG_ERR, r,
"Failed to write '%s' to '%s'%s: %m", "Failed to write '%s' to '%s'%s: %m",
action, filename, ignore ? ", ignoring" : ""); action, filename, ignore ? ", ignoring" : "");
if (IN_SET(r, -EACCES, -EROFS)) if (IN_SET(r, -EACCES, -ENODEV, -EROFS))
/* Inovoked by unpriviledged user, or read only filesystem. Return earlier. */ /* Inovoked by unpriviledged user, or read only filesystem. Return earlier. */
return r; return r;
if (ret == 0 && !ignore) if (ret == 0 && !ignore)