X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=7720acf03084ca1d3cd79777047f3618cebb61bb;hp=6784dda4487ae22a059ecbfcd8437babfc452d9c;hb=07e9b542017c692ee2abe7a8689517b466150944;hpb=e6cbe75a9a7cb424ca256c2769f3c7bb59332813

diff --git a/config.c b/config.c
index 6784dda..7720acf 100644
--- a/config.c
+++ b/config.c
@@ -56,11 +56,15 @@ static void
 config_parse_interface(struct uci_section *s, bool alias)
 {
 	struct interface *iface;
-	const char *type = NULL;
+	const char *type = NULL, *disabled;
 	struct blob_attr *config;
 	struct device *dev;
 	bool bridge = false;
 
+	disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
+	if (disabled && !strcmp(disabled, "1"))
+		return;
+
 	blob_buf_init(&b, 0);
 
 	if (!alias)
@@ -163,12 +167,16 @@ config_init_devices(void)
 
 		type = uci_lookup_option_string(uci_ctx, s, "type");
 		if (type) {
-			if (!strcmp(type, "bridge"))
+			if (!strcmp(type, "8021ad"))
+				devtype = &vlandev_device_type;
+			else if (!strcmp(type, "8021q"))
+				devtype = &vlandev_device_type;
+			else if (!strcmp(type, "bridge"))
 				devtype = &bridge_device_type;
-			else if (!strcmp(type, "tunnel"))
-				devtype = &tunnel_device_type;
 			else if (!strcmp(type, "macvlan"))
 				devtype = &macvlan_device_type;
+			else if (!strcmp(type, "tunnel"))
+				devtype = &tunnel_device_type;
 		}
 
 		if (!devtype)
@@ -190,8 +198,11 @@ config_init_package(const char *config)
 		ctx = uci_alloc_context();
 		uci_ctx = ctx;
 
+		ctx->flags &= ~UCI_FLAG_STRICT;
+		if (config_path)
+			uci_set_confdir(ctx, config_path);
+
 #ifdef DUMMY_MODE
-		uci_set_confdir(ctx, "./config");
 		uci_set_savedir(ctx, "./tmp");
 #endif
 	} else {