1
0
mirror of https://github.com/systemd/systemd synced 2025-10-03 18:54:45 +02:00

Compare commits

..

8 Commits

Author SHA1 Message Date
dependabot[bot]
ca6c192f9c build(deps): bump github/codeql-action from 3.29.2 to 3.29.5
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.2 to 3.29.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](181d5eefc2...51f77329af)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-01 18:41:41 +01:00
dependabot[bot]
e4b2b65f22 build(deps): bump meson from 1.8.2 to 1.8.3 in /.github/workflows
Bumps [meson](https://github.com/mesonbuild/meson) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/mesonbuild/meson/releases)
- [Commits](https://github.com/mesonbuild/meson/compare/1.8.2...1.8.3)

---
updated-dependencies:
- dependency-name: meson
  dependency-version: 1.8.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-01 18:12:00 +01:00
dependabot[bot]
67f213567a build(deps): bump ossf/scorecard-action from 2.4.1 to 2.4.2
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](f49aabe0b5...05b42c6244)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-01 18:11:08 +01:00
Michal Sekletar
dcf42d1ee2 sd-bus/bus-track: use install_callback in sd_bus_track_add_name()
Previously we didn't provide any install_callback to
sd_bus_add_match_async() so in case AddMatch() method call timed out we
destroyed the bus connection. This seems overly aggressive and simply
updating the sd_bus_track object accordingly should be enough.

Follow-up for 37ce3fd2b7dd8f81f6f4bca2003961a92b2963dc.

Fixes #32381
2025-08-01 18:09:44 +01:00
Christian Hesse
d05a077f16 bpf-dlopen: degrade log_level to LOG_DEBUG in initrd
That's what it used to behave before
4d2b9abbe11131d25aea4966a9c25a06703c6183.
2025-08-02 02:02:33 +09:00
Yu Watanabe
1afcf37a73 mkosi: update mkosi commit reference to 655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
* 655baf2447 mkosi-initrd: move udev rules files for dm and md
* dec7c3e754 mkosi-vm: Drop tpm_tis change
* 021e3af926 shim: fix log message of installed binary
* 07c24a7d42 mkosi-initrd/vm: ensure TPM2 core modules are installed in the initrd
2025-08-01 16:12:58 +01:00
Graham Clinch
9753ab34cd Correct order for implied time & date specifications.
The text now reads as:
[if] time specification is omitted, 00:00:00 is implied
[if] date specification is omitted, *-*-* is implied
2025-08-01 12:43:44 +01:00
Fabian Vogt
f305c8f4a7 virt: Actually use DMI detection on RISC-V as well
When booting Linux with ACPI in QEMU, the device tree is not used and
the DT based detection will not work. DMI values are accurate though
and indicate QEMU.

While detect_vm_dmi_vendor() was enabled for RISC-V in a previous commit,
it missed detect_vm_dmi(), so it was never actually used. Fix that.

Signed-off-by: Fabian Vogt <fvogt@suse.de>
2025-08-01 12:04:22 +01:00
12 changed files with 43 additions and 18 deletions

View File

@ -68,7 +68,7 @@ jobs:
path: ./out/artifacts path: ./out/artifacts
- name: Upload Sarif - name: Upload Sarif
if: always() && steps.build.outcome == 'success' if: always() && steps.build.outcome == 'success'
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d
with: with:
# Path to SARIF file relative to the root of the repository # Path to SARIF file relative to the root of the repository
sarif_file: cifuzz-sarif/results.sarif sarif_file: cifuzz-sarif/results.sarif

View File

@ -45,7 +45,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
config-file: ./.github/codeql-config.yml config-file: ./.github/codeql-config.yml
@ -53,7 +53,7 @@ jobs:
- run: sudo -E .github/workflows/unit-tests.sh SETUP - run: sudo -E .github/workflows/unit-tests.sh SETUP
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d

View File

@ -25,7 +25,7 @@ jobs:
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: systemd/mkosi@cb1a3c90490922441548d09b09c7b76426e4bc20 - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
# Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
# immediately, we remove the files in the background. However, we first move them to a different location # immediately, we remove the files in the background. However, we first move them to a different location

View File

@ -38,7 +38,7 @@ jobs:
LINTER_RULES_PATH: .github/linters LINTER_RULES_PATH: .github/linters
GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml
- uses: systemd/mkosi@cb1a3c90490922441548d09b09c7b76426e4bc20 - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
- name: Check that tabs are not used in Python code - name: Check that tabs are not used in Python code
run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py' run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py'

View File

@ -156,7 +156,7 @@ jobs:
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: systemd/mkosi@cb1a3c90490922441548d09b09c7b76426e4bc20 - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
# Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
# immediately, we remove the files in the background. However, we first move them to a different location # immediately, we remove the files in the background. However, we first move them to a different location

View File

@ -1,6 +1,6 @@
meson==1.8.2 \ meson==1.8.3 \
--hash=sha256:274b49dbe26e00c9a591442dd30f4ae9da8ce11ce53d0f4682cd10a45d50f6fd \ --hash=sha256:ef02b806ce0c5b6becd5bb5dc9fa67662320b29b337e7ace73e4354500590233 \
--hash=sha256:c105816d8158c76b72adcb9ff60297719096da7d07f6b1f000fd8c013cd387af --hash=sha256:f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf
ninja==1.11.1.4 \ ninja==1.11.1.4 \
--hash=sha256:055f386fb550c2c9d6157e45e20a84d29c47968876b9c5794ae2aec46f952306 \ --hash=sha256:055f386fb550c2c9d6157e45e20a84d29c47968876b9c5794ae2aec46f952306 \
--hash=sha256:096487995473320de7f65d622c3f1d16c3ad174797602218ca8c967f51ec38a0 \ --hash=sha256:096487995473320de7f65d622c3f1d16c3ad174797602218ca8c967f51ec38a0 \

View File

@ -34,7 +34,7 @@ jobs:
persist-credentials: false persist-credentials: false
- name: Run analysis - name: Run analysis
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1 uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
with: with:
results_file: results.sarif results_file: results.sarif
results_format: sarif results_format: sarif

View File

@ -247,7 +247,7 @@ tomorrow Pacific/Auckland → Thu 2012-11-23 19:00:00
decimal places.</para> decimal places.</para>
<para>Either time or date specification may be omitted, in which <para>Either time or date specification may be omitted, in which
case *-*-* and 00:00:00 is implied, respectively. If the case 00:00:00 and *-*-* is implied, respectively. If the
seconds component is not specified, <literal>:00</literal> is seconds component is not specified, <literal>:00</literal> is
assumed.</para> assumed.</para>

View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: LGPL-2.1-or-later # SPDX-License-Identifier: LGPL-2.1-or-later
[Config] [Config]
MinimumVersion=commit:cb1a3c90490922441548d09b09c7b76426e4bc20 MinimumVersion=commit:655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
Dependencies= Dependencies=
exitrd exitrd
initrd initrd

View File

@ -254,7 +254,7 @@ static int detect_vm_smbios(void) {
#endif /* defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) */ #endif /* defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) */
static Virtualization detect_vm_dmi(void) { static Virtualization detect_vm_dmi(void) {
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) || defined(__riscv)
int r; int r;
r = detect_vm_dmi_vendor(); r = detect_vm_dmi_vendor();

View File

@ -3,6 +3,7 @@
#include "sd-bus.h" #include "sd-bus.h"
#include "alloc-util.h" #include "alloc-util.h"
#include "bus-error.h"
#include "bus-internal.h" #include "bus-internal.h"
#include "bus-track.h" #include "bus-track.h"
#include "hashmap.h" #include "hashmap.h"
@ -13,6 +14,7 @@ typedef struct BusTrackItem {
unsigned n_ref; unsigned n_ref;
char *name; char *name;
sd_bus_slot *slot; sd_bus_slot *slot;
sd_bus_track *track;
} BusTrackItem; } BusTrackItem;
struct sd_bus_track { struct sd_bus_track {
@ -166,17 +168,38 @@ static sd_bus_track* track_free(sd_bus_track *track) {
DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_bus_track, sd_bus_track, track_free); DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_bus_track, sd_bus_track, track_free);
static int on_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) { static int on_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) {
sd_bus_track *track = ASSERT_PTR(userdata); BusTrackItem *item = ASSERT_PTR(userdata);
const char *name; const char *name;
int r; int r;
assert(message); assert(message);
assert(item->track);
r = sd_bus_message_read(message, "sss", &name, NULL, NULL); r = sd_bus_message_read(message, "sss", &name, NULL, NULL);
if (r < 0) if (r < 0)
return 0; return 0;
bus_track_remove_name_fully(track, name); bus_track_remove_name_fully(item->track, name);
return 0;
}
static int name_owner_changed_install_callback(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) {
BusTrackItem *item = ASSERT_PTR(userdata);
const sd_bus_error *e;
int r;
assert(message);
assert(item->track);
assert(item->name);
e = sd_bus_message_get_error(message);
if (!e)
return 0;
r = sd_bus_error_get_errno(e);
log_debug_errno(r, "Failed to install match for tracking name '%s': %s", item->name, bus_error_message(e, r));
bus_track_remove_name_fully(item->track, item->name);
return 0; return 0;
} }
@ -218,6 +241,7 @@ _public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
*n = (BusTrackItem) { *n = (BusTrackItem) {
.n_ref = 1, .n_ref = 1,
.track = track,
}; };
n->name = strdup(name); n->name = strdup(name);
@ -229,7 +253,7 @@ _public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
bus_track_remove_from_queue(track); /* don't dispatch this while we work in it */ bus_track_remove_from_queue(track); /* don't dispatch this while we work in it */
r = sd_bus_add_match_async(track->bus, &n->slot, match, on_name_owner_changed, NULL, track); r = sd_bus_add_match_async(track->bus, &n->slot, match, on_name_owner_changed, name_owner_changed_install_callback, n);
if (r < 0) { if (r < 0) {
bus_track_add_to_queue(track); bus_track_add_to_queue(track);
return r; return r;

View File

@ -2,6 +2,7 @@
#include "bpf-dlopen.h" #include "bpf-dlopen.h"
#include "dlfcn-util.h" #include "dlfcn-util.h"
#include "initrd-util.h"
#include "log.h" #include "log.h"
#if HAVE_LIBBPF #if HAVE_LIBBPF
@ -92,7 +93,7 @@ int dlopen_bpf_full(int log_level) {
* list for both files, and when we assume 1.0+ is present we can remove this dlopen */ * list for both files, and when we assume 1.0+ is present we can remove this dlopen */
dl = dlopen("libbpf.so.0", RTLD_NOW|RTLD_NODELETE); dl = dlopen("libbpf.so.0", RTLD_NOW|RTLD_NODELETE);
if (!dl) if (!dl)
return cached = log_full_errno(log_level, SYNTHETIC_ERRNO(EOPNOTSUPP), return cached = log_full_errno(in_initrd() ? LOG_DEBUG : log_level, SYNTHETIC_ERRNO(EOPNOTSUPP),
"Neither libbpf.so.1 nor libbpf.so.0 are installed, cgroup BPF features disabled: %s", "Neither libbpf.so.1 nor libbpf.so.0 are installed, cgroup BPF features disabled: %s",
dlerror()); dlerror());