Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bonding: proto notify error definitions

Browse source 
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>
This commit is contained in:
Florian Eckert 2020-03-25 09:45:05 +01:00
parent 720420a84a
commit b7e60a458b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/bonding/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=proto-bonding PKG_NAME:=proto-bonding
PKG_VERSION:=2020-03-03 PKG_VERSION:=2020-03-30
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

12
net/bonding/files/lib/netifd/proto/bonding.sh
View file

@ -73,7 +73,7 @@ proto_bonding_setup() {
# Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists) # Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists)
[ -f "$BONDING_MASTERS" ] || { [ -f "$BONDING_MASTERS" ] || {
echo "$cfg" "setup: bonding_masters does not exist in sysfs (kernel module not loaded?)" 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" proto_block_restart "$cfg"
return return
} }
@ -161,8 +161,8 @@ proto_bonding_setup() {
for slave in $slaves; do for slave in $slaves; do
if [ "$(cat /proc/net/dev |grep "$slave")" == "" ]; then if [ "$(cat /proc/net/dev |grep "$slave")" == "" ]; then
echo "$cfg" "ERROR IN CONFIGURATION - $slave: No such device" echo "$cfg" "No slave device $slave found"
proto_notify_error "$cfg" "ERROR IN CONFIGURATION - $slave: No such device" proto_notify_error "$cfg" NO_DEVICE
proto_block_restart "$cfg" proto_block_restart "$cfg"
return return
fi fi
@ -190,8 +190,8 @@ proto_bonding_setup() {
# For static configuration we _MUST_ have an IP address # For static configuration we _MUST_ have an IP address
[ -z "$ipaddr" ] && { [ -z "$ipaddr" ] && {
echo "$cfg" "INVALID LOCAL ADDRESS" echo "$cfg" "No local IP address defined"
proto_notify_error "$cfg" "INVALID_LOCAL_ADDRESS" proto_notify_error "$cfg" INVALID_LOCAL_ADDRESS
proto_block_restart "$cfg" proto_block_restart "$cfg"
return return
} }
@ -208,7 +208,7 @@ proto_bonding_teardown() {
# Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists) # Check for loaded kernel bonding driver (/sys/class/net/bonding_masters exists)
[ -f "$BONDING_MASTERS" ] || { [ -f "$BONDING_MASTERS" ] || {
echo "$cfg" "teardown: bonding_masters does not exist in sysfs (kernel module not loaded?)" 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" proto_block_restart "$cfg"
return return
} }