From: 0x0916 <w@laoqinren.net>
Date: Wed, 28 Jun 2017 02:58:29 +0000 (+0800)
Subject: confile: supporting new net hwaddr key in network_new_hwaddrs
X-Git-Tag: lxc-2.1.0~78^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a787c27b2a4e42c42e68282a28c9c937765ad8e;p=thirdparty%2Flxc.git

confile: supporting new net hwaddr key in network_new_hwaddrs

Signed-off-by: 0x0916 <w@laoqinren.net>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index ca50946b9..a63b5e398 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2606,7 +2606,6 @@ bool network_new_hwaddrs(struct lxc_conf *conf)
 {
 	char *lend, *p, *p2;
 	struct lxc_list *it;
-	const char *key = "lxc.network.hwaddr";
 	char *lstart = conf->unexpanded_config;
 
 	if (!conf->unexpanded_config)
@@ -2621,12 +2620,12 @@ bool network_new_hwaddrs(struct lxc_conf *conf)
 		else
 			lend++;
 
-		if (strncmp(lstart, key, strlen(key)) != 0) {
+		if (!lxc_config_net_hwaddr(lstart)) {
 			lstart = lend;
 			continue;
 		}
 
-		p = strchr(lstart + strlen(key), '=');
+		p = strchr(lstart, '=');
 		if (!p) {
 			lstart = lend;
 			continue;