SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31515 from keszybz/small-cleanups-after-review-of-stable-batch

Browse Source 
Small cleanups after review of stable batch
This commit is contained in:
Luca Boccassi
2024-02-27 20:07:18 +00:00
committed by GitHub
parent 5b0addafab f7364e1a51
commit 47c2a6e958
4 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/virt.c
+5 -5
View File
@@ -455,12 +455,12 @@ Virtualization detect_vm(void) {
/* We have to use the correct order here:
*
* → First, try to detect Oracle Virtualbox, Amazon EC2 Nitro, Parallels, and Google Compute Engine, even if they use KVM,
* as well as Xen even if it cloaks as Microsoft Hyper-V. Attempt to detect uml at this stage also
* since it runs as a user-process nested inside other VMs. Also check for Xen now, because Xen PV
* mode does not override CPUID when nested inside another hypervisor.
* → First, try to detect Oracle Virtualbox, Amazon EC2 Nitro, Parallels, and Google Compute Engine,
* even if they use KVM, as well as Xen, even if it cloaks as Microsoft Hyper-V. Attempt to detect
* UML at this stage too, since it runs as a user-process nested inside other VMs. Also check for
* Xen now, because Xen PV mode does not override CPUID when nested inside another hypervisor.
*
* → Second, try to detect from CPUID, this will report KVM for whatever software is used even if
* → Second, try to detect from CPUID. This will report KVM for whatever software is used even if
* info in DMI is overwritten.
*
* → Third, try to detect from DMI. */
src/shared/pam-util.c
+1 -1
View File
@@ -97,7 +97,7 @@ static void pam_bus_data_destroy(pam_handle_t *handle, void *data, int error_sta
d->bus && bus_origin_changed(d->bus))
/* Please adjust test/units/end.sh when updating the log message. */
pam_syslog(handle, LOG_DEBUG,
"Attempted to close sd-bus (%s) after fork whose connection is opened before the fork, this should not happen.",
"Warning: cannot close sd-bus connection (%s) after fork when it was opened before the fork.",
strna(d->cache_id));
pam_bus_data_free(data);