Author: nbd Date: 2015-12-14 12:02:12 +0100 (Mon, 14 Dec 2015) New Revision: 47891
Added: trunk/package/network/utils/linux-atm/files/br2684ctl_wrap Modified: trunk/package/network/utils/linux-atm/Makefile trunk/package/network/utils/linux-atm/files/br2684ctl Log: linux-atm: add wrapper for br2684ctl to defer nasX device bringup Fixes a race condition on netifd device bringup. Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/network/utils/linux-atm/Makefile =================================================================== --- trunk/package/network/utils/linux-atm/Makefile 2015-12-13 18:33:11 UTC (rev 47890) +++ trunk/package/network/utils/linux-atm/Makefile 2015-12-14 11:02:12 UTC (rev 47891) @@ -182,7 +182,10 @@ $(INSTALL_BIN) ./files/br2684ctl $(1)/etc/init.d/ $(INSTALL_DATA) ./files/atm.hotplug $(1)/etc/hotplug.d/atm/00-trigger $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(1)/usr/sbin/ + $(INSTALL_BIN) \ + ./files/br2684ctl_wrap \ + $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl \ + $(1)/usr/sbin/ endef $(eval $(call BuildPackage,linux-atm)) Modified: trunk/package/network/utils/linux-atm/files/br2684ctl =================================================================== --- trunk/package/network/utils/linux-atm/files/br2684ctl 2015-12-13 18:33:11 UTC (rev 47890) +++ trunk/package/network/utils/linux-atm/files/br2684ctl 2015-12-14 11:02:12 UTC (rev 47891) @@ -58,7 +58,7 @@ procd_open_instance procd_set_param command \ - /usr/sbin/br2684ctl \ + /usr/sbin/br2684ctl_wrap "nas$unit" \ -c "$unit" -e "$encaps" -p "$payload" \ -a "$circuit" ${qos:+-q "$qos"} ${sendsize:+-s "$sendsize"} procd_close_instance Added: trunk/package/network/utils/linux-atm/files/br2684ctl_wrap =================================================================== --- trunk/package/network/utils/linux-atm/files/br2684ctl_wrap (rev 0) +++ trunk/package/network/utils/linux-atm/files/br2684ctl_wrap 2015-12-14 11:02:12 UTC (rev 47891) @@ -0,0 +1,5 @@ +#!/bin/sh +. /lib/functions/network.sh +device="$1"; shift +network_defer_device "$device" +exec /usr/sbin/br2684ctl "$@" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
