dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27320 from poettering/kmod-setup-tweaks

Browse Source 
minor tweaks to kmod-setup.c
This commit is contained in:
Mike Yuan
2023-04-18 19:25:08 +08:00
committed by GitHub
parent d5fbaa965e 0a5d3c0b5b
commit 901ba45cfe
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/kmod-setup.c
View File

@@ -11,6 +11,7 @@
#include "macro.h"
#include "recurse-dir.h"
#include "string-util.h"
#include "strv.h"
#include "virt.h"
#if HAVE_KMOD
@@ -57,10 +58,7 @@ static int has_virtio_rng_recurse_dir_cb(
return RECURSE_DIR_LEAVE_DIRECTORY;
}
if (startswith(alias, "pci:v00001AF4d00001005"))
return 1;
if (startswith(alias, "pci:v00001AF4d00001044"))
if (STARTSWITH_SET(alias, "pci:v00001AF4d00001005", "pci:v00001AF4d00001044"))
return 1;
return RECURSE_DIR_LEAVE_DIRECTORY;
@@ -69,6 +67,10 @@ static int has_virtio_rng_recurse_dir_cb(
static bool has_virtio_rng(void) {
int r;
/* Directory traversal might be slow, hence let's do a cheap check first if it's even worth it */
if (detect_vm() == VIRTUALIZATION_NONE)
return false;
r = recurse_dir_at(
AT_FDCWD,
"/sys/devices/pci0000:00",