diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-01-25 18:30:43 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-03-07 18:49:44 +0100 |
| commit | e5abff372d028d28d50165358cd48b624cd0c2d2 (patch) | |
| tree | deff5a7ab41edcf31dedd391c90f19bc3650c6d0 /src/shared/udev-util.c | |
| parent | constants: drop duplicated CONF_PATHS defines (diff) | |
| download | systemd-e5abff372d028d28d50165358cd48b624cd0c2d2.tar.xz systemd-e5abff372d028d28d50165358cd48b624cd0c2d2.zip | |
shared/conf-parser: collapse pkgdir and conf_file args into one
This essentially reverts 5656cdfeeabc16b5489f5ec7a0a36025a2ec1f23. I find it
much easier to understand what is going on when the
path-relative-to-the-search-path is passed in full, instead of being constructed
from two parts, with one of the parts being implicit in some places.
Also, we call 'systemd-analyze cat-config <path>' with <path> with the same
meaning, so this makes the internal and external APIs more consistent.
Diffstat (limited to 'src/shared/udev-util.c')
| -rw-r--r-- | src/shared/udev-util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c index 9acdaeff52..205afc5723 100644 --- a/src/shared/udev-util.c +++ b/src/shared/udev-util.c @@ -28,9 +28,8 @@ int udev_parse_config_full(const ConfigTableItem config_table[]) { assert(config_table); - r = config_parse_config_file_full( - "udev.conf", - "udev", + r = config_parse_config_file( + "udev/udev.conf", /* sections = */ NULL, config_item_table_lookup, config_table, |