From: Florian Eckert <redacted>
Date: Thu, 16 Nov 2017 09:47:23 +0000 (+0100)
Subject: net/keepalived: on virtual IP allow empty device option
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=062c35f5600d0ab42693a0a40a80a31d9e1f95be;p=openwrt-packages.git

net/keepalived: on virtual IP allow empty device option

If ip is referenced in the instance section it is not necessary to add a
device option on every "ip_address". In most sitution it es enough to
add only an ip. Allow empty device option will solve this issue.

Signed-off-by: Florian Eckert <redacted>
---

diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init
index 778777b67..8f50161cd 100644
--- a/net/keepalived/files/keepalived.init
+++ b/net/keepalived/files/keepalived.init
@@ -123,13 +123,17 @@ print_ipaddress_indent() {
 	# Default indent
 	[ -z "$indent" ] && indent=$INDENT_1
 
-	# If no address or device exit
-	[ -z "$address" -o -z "$device" ] && return 0
+	# If no address exit
+	[ -z "$address" ] && return 0
 
-	# Add IP address/netmask and device
-	printf "$indent$address dev $device" >> $KEEPALIVED_CONF
-	# Add scope
-	[ -n "$scope" ] && printf " scope $scope" >> $KEEPALIVED_CONF
+	if [ -z "$device" ]; then
+		printf "$indent$address" >> $KEEPALIVED_CONF
+	else
+		# Add IP address/netmask and device
+		printf "$indent$address dev $device" >> $KEEPALIVED_CONF
+		# Add scope
+		[ -n "$scope" ] && printf " scope $scope" >> $KEEPALIVED_CONF
+	fi
 
 	printf "\n" >> $KEEPALIVED_CONF
 }