networkd: cleanup for #10542

fixes: 53b1f7d
systemd · Nov 6, 2018 · dc54955 · dc54955
1 parent 8912a99
commit dc54955
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
@@ -1269,9 +1269,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>AdActorSysPrio=</varname></term>
+        <term><varname>AdActorSystemPriority=</varname></term>
         <listitem>
-          <para>Specifies the 802.3ad system priority. Ranges [1-65535].</para>
+          <para>Specifies the 802.3ad actor system priority. Ranges [1-65535].</para>
         </listitem>
       </varlistentry>
 

diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
@@ -414,7 +414,7 @@ int config_parse_ad_actor_sys_prio(const char *unit,
         }
 
         if (v == 0) {
-                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse actor system priority '%s'. Range is [1,65535], ignoring: %m", rvalue);
+                log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse actor system priority '%s'. Range is [1,65535], ignoring.", rvalue);
                 return 0;
         }
 
@@ -449,7 +449,7 @@ int config_parse_ad_user_port_key(const char *unit,
         }
 
         if (v > 1023) {
-                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse user port key '%s'. Range is [0,1023], ignoring: %m", rvalue);
+                log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse user port key '%s'. Range is [0,1023], ignoring.", rvalue);
                 return 0;
         }
 
@@ -488,7 +488,7 @@ int config_parse_ad_actor_system(const char *unit,
         }
 
         if (ether_addr_is_null(n) || (n->ether_addr_octet[0] & 0x01)) {
-                log_syntax(unit, LOG_ERR, filename, line, r, "Not a valid MAC address %s, can not be null or multicast. Ignoring assignment: %m", rvalue);
+                log_syntax(unit, LOG_ERR, filename, line, 0, "Not a valid MAC address %s, can not be null or multicast. Ignoring assignment.", rvalue);
                 return 0;
         }
 

diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
@@ -143,7 +143,7 @@ Bond.UpDelaySec,                   config_parse_sec,                     0,
 Bond.DownDelaySec,                 config_parse_sec,                     0,                             offsetof(Bond, downdelay)
 Bond.ARPIntervalSec,               config_parse_sec,                     0,                             offsetof(Bond, arp_interval)
 Bond.LearnPacketIntervalSec,       config_parse_sec,                     0,                             offsetof(Bond, lp_interval)
-Bond.AdActorSysPrio,               config_parse_ad_actor_sys_prio,       0,                             offsetof(Bond, ad_actor_sys_prio)
+Bond.AdActorSystemPriority,        config_parse_ad_actor_sys_prio,       0,                             offsetof(Bond, ad_actor_sys_prio)
 Bond.AdUserPortKey,                config_parse_ad_user_port_key,        0,                             offsetof(Bond, ad_user_port_key)
 Bond.AdActorSystem,                config_parse_ad_actor_system,         0,                             offsetof(Bond, ad_actor_system)
 Bridge.HelloTimeSec,               config_parse_sec,                     0,                             offsetof(Bridge, hello_time)

diff --git a/test/test-network/conf/25-bond.netdev b/test/test-network/conf/25-bond.netdev
@@ -11,7 +11,7 @@ UpDelaySec=2s
 DownDelaySec=2s
 ResendIGMP=4
 MinLinks=1
-AdActorSysPrio=1218
+AdActorSystemPriority=1218
 AdUserPortKey=811
 AdActorSystem=00:11:22:33:44:55
 # feed the sanitizer