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

network: hook up "machine tag" concept, also with .network/.link/.netdev files

Browse Source 
Follow-up for: 461ec6facc
This commit is contained in:
Lennart Poettering
2026-06-19 20:38:13 +02:00
committed by Lennart Poettering
parent 491ee4afb1
commit d3d68a2937
6 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd.link.xml
+14
View File
@@ -365,6 +365,20 @@
<xi:include href="version-info.xml" xpointer="v249"/>
</listitem>
</varlistentry>
<varlistentry id='machine-tag'>
<term><varname>MachineTag=</varname></term>
<listitem>
<para>Matches against the tags assigned to the local machine. See
<varname>ConditionMachineTag=</varname> in
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. When prefixed with an exclamation mark (<literal>!</literal>), the result is negated.
If an empty string is assigned, the previously assigned value is cleared.
</para>
<xi:include href="version-info.xml" xpointer="v262"/>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
man/systemd.netdev.xml
+1
View File
@@ -230,6 +230,7 @@
<xi:include href="systemd.link.xml" xpointer="credential" />
<xi:include href="systemd.link.xml" xpointer="architecture" />
<xi:include href="systemd.link.xml" xpointer="firmware" />
<xi:include href="systemd.link.xml" xpointer="machine-tag" />
</variablelist>
</refsect1>
man/systemd.network.xml
+1
View File
@@ -165,6 +165,7 @@
<xi:include href="systemd.link.xml" xpointer="credential" />
<xi:include href="systemd.link.xml" xpointer="architecture" />
<xi:include href="systemd.link.xml" xpointer="firmware" />
<xi:include href="systemd.link.xml" xpointer="machine-tag" />
</variablelist>
</refsect1>
src/network/netdev/netdev-gperf.gperf
+1
View File
@@ -52,6 +52,7 @@ Match.Version, config_parse_net_condition,
Match.Credential, config_parse_net_condition, CONDITION_CREDENTIAL, offsetof(NetDev, conditions)
Match.Architecture, config_parse_net_condition, CONDITION_ARCHITECTURE, offsetof(NetDev, conditions)
Match.Firmware, config_parse_net_condition, CONDITION_FIRMWARE, offsetof(NetDev, conditions)
Match.MachineTag, config_parse_net_condition, CONDITION_MACHINE_TAG, offsetof(NetDev, conditions)
NetDev.Description, config_parse_string, 0, offsetof(NetDev, description)
NetDev.Name, config_parse_ifname, 0, offsetof(NetDev, ifname)
NetDev.Kind, config_parse_netdev_kind, 0, offsetof(NetDev, kind)
src/network/networkd-network-gperf.gperf
+1
View File
@@ -94,6 +94,7 @@ Match.Version, config_parse_net_condition,
Match.Credential, config_parse_net_condition, CONDITION_CREDENTIAL, offsetof(Network, conditions)
Match.Architecture, config_parse_net_condition, CONDITION_ARCHITECTURE, offsetof(Network, conditions)
Match.Firmware, config_parse_net_condition, CONDITION_FIRMWARE, offsetof(Network, conditions)
Match.MachineTag, config_parse_net_condition, CONDITION_MACHINE_TAG, offsetof(Network, conditions)
Link.MACAddress, config_parse_hw_addr, 0, offsetof(Network, hw_addr)
Link.MTUBytes, config_parse_mtu, AF_UNSPEC, offsetof(Network, mtu)
Link.Group, config_parse_link_group, 0, 0
src/udev/net/link-config-gperf.gperf
+1
View File
@@ -40,6 +40,7 @@ Match.Version, config_parse_net_condition,
Match.Credential, config_parse_net_condition, CONDITION_CREDENTIAL, offsetof(LinkConfig, conditions)
Match.Architecture, config_parse_net_condition, CONDITION_ARCHITECTURE, offsetof(LinkConfig, conditions)
Match.Firmware, config_parse_net_condition, CONDITION_FIRMWARE, offsetof(LinkConfig, conditions)
Match.MachineTag, config_parse_net_condition, CONDITION_MACHINE_TAG, offsetof(LinkConfig, conditions)
Link.Description, config_parse_string, 0, offsetof(LinkConfig, description)
/* udev property */
Link.Property, config_parse_udev_property, 0, offsetof(LinkConfig, properties)