SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29353 from YHNdnzj/nft-followup

Browse Source 
man/org.freedesktop.systemd1: add version info for NFTSet
This commit is contained in:
Luca Boccassi
2023-09-27 21:02:43 +01:00
committed by GitHub
parent 05ae788d28 6bd8340d11
commit 89e7b9652b
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/org.freedesktop.systemd1.xml
+8 -2
View File
@@ -11643,6 +11643,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
<varname>RootImagePolicy</varname>,
<varname>MountImagePolicy</varname>, and
<varname>ExtensionImagePolicy</varname> were added in version 254.</para>
<para><varname>NFTSet</varname> was added in version 255.</para>
</refsect2>
<refsect2>
<title>Socket Unit Objects</title>
@@ -11665,8 +11666,9 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
<varname>RootImagePolicy</varname>,
<varname>MountImagePolicy</varname>, and
<varname>ExtensionImagePolicy</varname> were added in version 254.</para>
<para><varname>PollLimitIntervalUSec</varname> and
<varname>PollLimitBurst</varname> were added in version 255.</para>
<para><varname>PollLimitIntervalUSec</varname>,
<varname>PollLimitBurst</varname>, and
<varname>NFTSet</varname> were added in version 255.</para>
</refsect2>
<refsect2>
<title>Mount Unit Objects</title>
@@ -11689,6 +11691,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
<varname>RootImagePolicy</varname>,
<varname>MountImagePolicy</varname>, and
<varname>ExtensionImagePolicy</varname> were added in version 254.</para>
<para><varname>NFTSet</varname> was added in version 255.</para>
</refsect2>
<refsect2>
<title>Swap Unit Objects</title>
@@ -11711,6 +11714,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
<varname>RootImagePolicy</varname>,
<varname>MountImagePolicy</varname>, and
<varname>ExtensionImagePolicy</varname> were added in version 254.</para>
<para><varname>NFTSet</varname> was added in version 255.</para>
</refsect2>
<refsect2>
<title>Slice Unit Objects</title>
@@ -11725,6 +11729,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
<varname>StartupMemoryZSwapMax</varname>,
<varname>MemoryPressureWatch</varname>, and
<varname>MemoryPressureThresholdUSec</varname> were added in version 254.</para>
<para><varname>NFTSet</varname> was added in version 255.</para>
</refsect2>
<refsect2>
<title>Scope Unit Objects</title>
@@ -11740,6 +11745,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
<varname>StartupMemoryZSwapMax</varname>,
<varname>MemoryPressureWatch</varname>, and
<varname>MemoryPressureThresholdUSec</varname> were added in version 254.</para>
<para><varname>NFTSet</varname> was added in version 255.</para>
</refsect2>
<refsect2>
<title>Job Objects</title>
src/core/unit.c
+10 -21
View File
@@ -3786,7 +3786,7 @@ int unit_add_blockdev_dependency(Unit *u, const char *what, UnitDependencyMask m
}
int unit_coldplug(Unit *u) {
int r = 0, q;
int r = 0;
assert(u);
@@ -3796,29 +3796,18 @@ int unit_coldplug(Unit *u) {
u->coldplugged = true;
STRV_FOREACH(i, u->deserialized_refs) {
q = bus_unit_track_add_name(u, *i);
if (q < 0 && r >= 0)
r = q;
}
STRV_FOREACH(i, u->deserialized_refs)
RET_GATHER(r, bus_unit_track_add_name(u, *i));
u->deserialized_refs = strv_free(u->deserialized_refs);
if (UNIT_VTABLE(u)->coldplug) {
q = UNIT_VTABLE(u)->coldplug(u);
if (q < 0 && r >= 0)
r = q;
}
if (UNIT_VTABLE(u)->coldplug)
RET_GATHER(r, UNIT_VTABLE(u)->coldplug(u));
if (u->job) {
q = job_coldplug(u->job);
if (q < 0 && r >= 0)
r = q;
}
if (u->nop_job) {
q = job_coldplug(u->nop_job);
if (q < 0 && r >= 0)
r = q;
}
if (u->job)
RET_GATHER(r, job_coldplug(u->job));
if (u->nop_job)
RET_GATHER(r, job_coldplug(u->nop_job));
CGroupContext *c = unit_get_cgroup_context(u);
if (c)