From b7e60a458be6db1061c95f4c700255ff57aa428b Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 25 Mar 2020 09:45:05 +0100 Subject: 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 --- net/bonding/files/lib/netifd/proto/bonding.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'net/bonding/files/lib') diff --git a/net/bonding/files/lib/netifd/proto/bonding.sh b/net/bonding/files/lib/netifd/proto/bonding.sh index 5b106bc03..556d7c824 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 } -- cgit v1.2.3