diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
| commit | 78e9bb837c258ac0ec7712b3d612cc2f407e731e (patch) | |
| tree | f515d16b6efd858a9aeb5b0ef5d6f90bf288283d /src/pstore | |
| parent | Adding debian version 255.5-1. (diff) | |
| download | systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.tar.xz systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.zip | |
Merging upstream version 256.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/pstore')
| -rw-r--r-- | src/pstore/meson.build | 6 | ||||
| -rw-r--r-- | src/pstore/pstore.c | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/pstore/meson.build b/src/pstore/meson.build index b6fda87..27c2855 100644 --- a/src/pstore/meson.build +++ b/src/pstore/meson.build @@ -7,9 +7,9 @@ executables += [ 'sources' : files('pstore.c'), 'dependencies' : [ libacl, - liblz4, - libxz, - libzstd, + liblz4_cflags, + libxz_cflags, + libzstd_cflags, threads, ], }, diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c index 8f32a0a..e2dfc4d 100644 --- a/src/pstore/pstore.c +++ b/src/pstore/pstore.c @@ -56,9 +56,9 @@ typedef enum PStoreStorage { } PStoreStorage; static const char* const pstore_storage_table[_PSTORE_STORAGE_MAX] = { - [PSTORE_STORAGE_NONE] = "none", + [PSTORE_STORAGE_NONE] = "none", [PSTORE_STORAGE_EXTERNAL] = "external", - [PSTORE_STORAGE_JOURNAL] = "journal", + [PSTORE_STORAGE_JOURNAL] = "journal", }; DEFINE_PRIVATE_STRING_TABLE_LOOKUP(pstore_storage, PStoreStorage); @@ -77,9 +77,12 @@ static int parse_config(void) { {} }; - return config_parse_config_file("pstore.conf", "PStore\0", - config_item_table_lookup, items, - CONFIG_PARSE_WARN, NULL); + return config_parse_standard_file_with_dropins( + "systemd/pstore.conf", + "PStore\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, + /* userdata= */ NULL); } /* File list handling - PStoreEntry is the struct and @@ -279,6 +282,7 @@ static int process_dmesg_files(PStoreList *list) { } else log_debug("Unknown backend, ignoring \"%s\".", pe->dirent.d_name); } + return 0; } |