From: Florian Eckert <fe@dev.tdt.de>
Date: Wed, 25 Mar 2020 08:45:05 +0000 (+0100)
Subject: bonding: proto notify error definitions
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b7e60a458be6db1061c95f4c700255ff57aa428b;p=feed%2Fpackages.git

bonding: proto notify error definitions

Fix proto_notify_error usage. In this function only a definition shall
be returned, which will later appear in the ubus status output of the
interface and not a whole string.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/net/bonding/Makefile b/net/bonding/Makefile
index 82543d2427..5c74d6b5ce 100644
--- a/net/bonding/Makefile
+++ b/net/bonding/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=proto-bonding
-PKG_VERSION:=2020-03-03
+PKG_VERSION:=2020-03-30
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
diff --git a/net/bonding/files/lib/netifd/proto/bonding.sh b/net/bonding/files/lib/netifd/proto/bonding.sh
index 5b106bc034..556d7c824e 100755
--- a/net/bonding/files/lib/netifd/proto/bonding.sh
+++ b/net/bonding/files/lib/netifd/proto/bonding.sh
@@ -73,7 +73,7 @@ proto_bonding_setup() {
 	# Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists)
 	[ -f "$BONDING_MASTERS" ] || {
 		echo "$cfg" "setup: bonding_masters does not exist in sysfs (kernel module not loaded?)"
-		proto_notify_error "$cfg" "setup: bonding_masters does not exist in sysfs (kernel module not loaded?)"
+		proto_notify_error "$cfg" BONDING_MASTER_DOES_NOT_EXIST
 		proto_block_restart "$cfg"
 		return
 	}
@@ -161,8 +161,8 @@ proto_bonding_setup() {
 	for slave in $slaves; do
 
 		if [ "$(cat /proc/net/dev |grep "$slave")" == "" ]; then
-			echo "$cfg" "ERROR IN CONFIGURATION - $slave: No such device"
-			proto_notify_error "$cfg" "ERROR IN CONFIGURATION - $slave: No such device"
+			echo "$cfg" "No slave device $slave found"
+			proto_notify_error "$cfg" NO_DEVICE
 			proto_block_restart "$cfg"
 			return
 		fi
@@ -190,8 +190,8 @@ proto_bonding_setup() {
 
 	# For static configuration we _MUST_ have an IP address
 	[ -z "$ipaddr" ] && {
-		echo "$cfg" "INVALID LOCAL ADDRESS"
-		proto_notify_error "$cfg" "INVALID_LOCAL_ADDRESS"
+		echo "$cfg" "No local IP address defined"
+		proto_notify_error "$cfg" INVALID_LOCAL_ADDRESS
 		proto_block_restart "$cfg"
 		return
 	}
@@ -208,7 +208,7 @@ proto_bonding_teardown() {
 	# Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists)
 	[ -f "$BONDING_MASTERS" ] || {
 		echo "$cfg" "teardown: bonding_masters does not exist in sysfs (kernel module not loaded?)"
-		proto_notify_error "$cfg" "teardown: bonding_masters does not exist in sysfs (kernel module not loaded?)"
+		proto_notify_error "$cfg" BONDING_MASTER_DOES_NOT_EXIST
 		proto_block_restart "$cfg"
 		return
 	}