netifd: Fix nested protocols going offline at reload + various route issues
Much thanks to Hans Dedecker SVN-Revision: 40746
This commit is contained in:
		@@ -1,13 +1,13 @@
 | 
				
			|||||||
include $(TOPDIR)/rules.mk
 | 
					include $(TOPDIR)/rules.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PKG_NAME:=netifd
 | 
					PKG_NAME:=netifd
 | 
				
			||||||
PKG_VERSION:=2014-05-02
 | 
					PKG_VERSION:=2014-05-09
 | 
				
			||||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)
 | 
					PKG_RELEASE=$(PKG_SOURCE_VERSION)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PKG_SOURCE_PROTO:=git
 | 
					PKG_SOURCE_PROTO:=git
 | 
				
			||||||
PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git
 | 
					PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git
 | 
				
			||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 | 
					PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 | 
				
			||||||
PKG_SOURCE_VERSION:=023db1ca8f352a646700f2d60c397fb89492f4c8
 | 
					PKG_SOURCE_VERSION:=8714f17ad66fa29383170ad45b9c150b9818dbdf
 | 
				
			||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 | 
					PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 | 
				
			||||||
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 | 
					PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 | 
				
			||||||
# PKG_MIRROR_MD5SUM:=
 | 
					# PKG_MIRROR_MD5SUM:=
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -92,7 +92,6 @@ setup_interface () {
 | 
				
			|||||||
		[ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE"
 | 
							[ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE"
 | 
				
			||||||
		json_close_object
 | 
							json_close_object
 | 
				
			||||||
		ubus call network add_dynamic "$(json_dump)"
 | 
							ubus call network add_dynamic "$(json_dump)"
 | 
				
			||||||
		ifup "$IFACE_DSLITE"
 | 
					 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	MAPTYPE=""
 | 
						MAPTYPE=""
 | 
				
			||||||
@@ -121,7 +120,6 @@ setup_interface () {
 | 
				
			|||||||
		[ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE"
 | 
							[ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE"
 | 
				
			||||||
		json_close_object
 | 
							json_close_object
 | 
				
			||||||
		ubus call network add_dynamic "$(json_dump)"
 | 
							ubus call network add_dynamic "$(json_dump)"
 | 
				
			||||||
		ifup "$IFACE_MAP"
 | 
					 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN
 | 
						# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user