From: Hans Dedecker <dedeckeh@gmail.com>
Date: Fri, 6 Oct 2017 14:56:42 +0000 (+0200)
Subject: config: suppress error if no wireless config present (FS#1030)
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=5df3f01a06b2710a8d8010f353db45b7507b15fb

config: suppress error if no wireless config present (FS#1030)

Wireless config is optional as not all targets have a wireless interface;
therefore don't report an error if the wireless config is missing so
network reload is not reporting an error to the user.
While at it use netifd_log_message to print an error if the config cannot
be loaded.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/config.c b/config.c
index a7112f0..21791af 100644
--- a/config.c
+++ b/config.c
@@ -412,16 +412,23 @@ int
 config_init_all(void)
 {
 	int ret = 0;
+	char *err;
 
 	uci_network = config_init_package("network");
 	if (!uci_network) {
-		fprintf(stderr, "Failed to load network config\n");
+		uci_get_errorstr(uci_ctx, &err, NULL);
+		netifd_log_message(L_CRIT, "Failed to load network config (%s)\n", err);
+		free(err);
 		return -1;
 	}
 
 	uci_wireless = config_init_package("wireless");
-	if (!uci_wireless)
+	if (!uci_wireless && uci_ctx->err != UCI_ERR_NOTFOUND) {
+		uci_get_errorstr(uci_ctx, &err, NULL);
+		netifd_log_message(L_CRIT, "Failed to load wireless config (%s)\n", err);
+		free(err);
 		ret = -1;
+	}
 
 	vlist_update(&interfaces);
 	config_init = true;