Merge b971f3852e into 94eacb9329

network/nexthop: fix argument name
Fixes copy-and-paste error in b5b42b516e.
2024-11-24 19:20:11 +01:00 · 2024-11-23 17:52:52 +09:00 · 2024-11-23 17:52:52 +09:00 · 2024-11-23 17:52:52 +09:00 · 2024-11-23 17:52:52 +09:00 · 2024-11-23 17:52:52 +09:00
10 changed files with 7 additions and 18 deletions
--- a/mkosi.clangd
+++ b/mkosi.clangd
@ -1,18 +1,12 @@
 #!/bin/bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
-if command -v flatpak-spawn >/dev/null; then
+MKOSI_CONFIG="$(mkosi --json summary | jq -r .Images[-1])"
    SPAWN=(flatpak-spawn --host)
 else
    SPAWN=()
 fi
 MKOSI_CONFIG="$("${SPAWN[@]}" --host mkosi --json summary | jq -r .Images[-1])"
 DISTRIBUTION="$(jq -r .Distribution <<< "$MKOSI_CONFIG")"
 RELEASE="$(jq -r .Release <<< "$MKOSI_CONFIG")"
 ARCH="$(jq -r .Architecture <<< "$MKOSI_CONFIG")"
-exec "${SPAWN[@]}" mkosi \
+exec mkosi \
    --incremental=strict \
    --build-sources-ephemeral=no \
    --format=none \
--- a/mkosi.conf
+++ b/mkosi.conf
@ -38,8 +38,9 @@ SignExpectedPcr=yes
 [Content]
 ExtraTrees=
        mkosi.extra.common
        mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
        mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
        mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
        %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw
        %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity
        %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig
--- a/mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
+++ b/mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
--- a/mkosi.extra.common/etc/issue
+++ b/mkosi.extra.common/etc/issue
--- a/mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf
+++ b/mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf
--- a/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset
+++ b/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset
--- a/mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset
+++ b/mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset
--- a/mkosi.images/initrd/mkosi.conf
+++ b/mkosi.images/initrd/mkosi.conf
@ -6,7 +6,9 @@ Include=
        %D/mkosi.sanitizers
 [Content]
-ExtraTrees=%D/mkosi.extra.common
+ExtraTrees=
        %D/mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
        %D/mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
 Packages=
        findutils
--- a/mkosi.extra.common/usr/lib/systemd/leak-sanitizer-suppressions
+++ b/mkosi.extra.common/usr/lib/systemd/leak-sanitizer-suppressions
--- a/test/units/TEST-22-TMPFILES.sh
+++ b/test/units/TEST-22-TMPFILES.sh
@ -6,14 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 if systemd-detect-virt --quiet --container; then
    # This comes from the selinux package and tries to write
    # some files under sysfs, which will be read-only in a container,
    # so mask it. It's not our tmpfiles.d file anyway.
    mkdir -p /run/tmpfiles.d/
    ln -s /dev/null /run/tmpfiles.d/selinux-policy.conf
 fi
 run_subtests
 touch /testok
Author	SHA1	Message	Date
Yu Watanabe	f52411e92b	Merge `b971f3852e` into `94eacb9329`	2024-11-24 19:20:11 +01:00
Yu Watanabe	b971f3852e	network/nexthop: fix argument name Fixes copy-and-paste error in `b5b42b516e`.	2024-11-23 17:52:52 +09:00
Yu Watanabe	e532319020	network: introduce address_forget() and friends and use it where applicable No functional change, just refactoring.	2024-11-23 17:52:52 +09:00
Yu Watanabe	559cc2bef9	network/nexthop: drop outdated comment and add one debugging log All NextHop objects are managed by Manager since `352eba2e49`.	2024-11-23 17:52:52 +09:00
Yu Watanabe	e5eb3ad653	network/ndisc: unref Route objects that depend on the nexthop No functional change, as when this function is called, the set will be freed and contained Route objects will be unref()ed anyway soon later by nexthop_detach() -> nexthop_free(). Even though, when the routes are forgotten from the Manager, then it is not necessary to keep them by the nexthop. Let's unref earlier.	2024-11-23 17:52:52 +09:00
Yu Watanabe	c9285f3ad7	network/ndisc: constify several arguments and add several assertions Follow-up for `0f8afaf94d`. No functional change, just for safety.	2024-11-23 17:52:52 +09:00
Yu Watanabe	e85a7545af	network/nexthop: do not share NextHop.nexthops and NextHop.routes with duplicated object Otherwise, these may be freed twice. But, fortunately, when this function is called, both are NULL. So, this should not change any behavior. But for safety.	2024-11-23 17:52:52 +09:00
Yu Watanabe	7669f20eed	network: drop outdated comment All Route objects are managed by Manager since `8d01e44c1f`.	2024-11-23 17:52:52 +09:00