From patchwork Fri Dec 1 22:38:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Yeryomin X-Patchwork-Id: 843770 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eJc1/h4B"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ypTjf0K2Bz9s7B for ; Sat, 2 Dec 2017 09:39:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JV0orr9/UJ2NJs+8ZVd42x06Z6pYSsN/BiNBPDF/MYA=; b=eJc1/h4BqEUWJ3 s4371gbie4GE7hqotn3IoRWDRP9iuhdYcBWiJYlTrm7gSiK0qAeTBk4t5pV915oLl0Tx/gUOWDoAw D4DvvrHvh+6f07WqIw6TLrft6nGoz9gJqnuUSK03DuIEK9oDzZChmgHdJLQASuFN9YA/CotJFsYzG e3DUhmMHfvodF2Iu/FYp78+cNNZWq+lvYFiKhjMOhfv6MtXG6Oh+tJ7zRdLg5Uw779XBNN2VMziUZ JjiI3ymdbnymuvBh6kAL8z5FqNnaQ97C9fIDSfBUFNO/OBn/TxRaPQg6B/esKSnwnw5I5QYLjF2uV ktOntSYDlwuTsIf0PtTg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKty3-0004ss-8B; Fri, 01 Dec 2017 22:39:35 +0000 Received: from [213.175.92.62] (helo=mail.pbx.lv) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKtxy-0004rS-SP for lede-dev@lists.infradead.org; Fri, 01 Dec 2017 22:39:33 +0000 Received: from localhost.localdomain (unknown [213.175.92.61]) by mail.pbx.lv (MailSystem) with ESMTPSA id A7DC419E404 for ; Sat, 2 Dec 2017 00:39:03 +0200 (EET) From: Roman Yeryomin To: LEDE Development List Date: Sat, 2 Dec 2017 00:38:28 +0200 Message-Id: <20171201223828.4572-1-roman@advem.lv> X-Mailer: git-send-email 2.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171201_143931_128315_678A01BE X-CRM114-Status: UNSURE ( 6.23 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS Subject: [LEDE-DEV] [PATCH v2] base-files: expand ucidef_set_interface_raw to allow custom configuration X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This allows custom config generation. E.g. setting lan adrress from eeprom or random address (so that routers can be chained by default) or configuring a fully custom interface. Changes from v1: - fix protocol option name for users Signed-off-by: Roman Yeryomin --- .../base-files/files/lib/functions/uci-defaults.sh | 26 +++++++++++++++++++++- .../linux/ar71xx/base-files/etc/board.d/02_network | 4 ++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index 82ac1d2a4d..0cd519a147 100755 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -88,8 +88,32 @@ ucidef_set_interfaces_lan_wan() { } ucidef_set_interface_raw() { + local opt=";" + local val="" + + [ -z "$1" ] && return + json_select_object network - _ucidef_set_interface "$@" + + for i in "$@"; do + [ "$opt" == ";" ] && { + json_select_object "$i" + opt="" + continue + } + [ -z $opt ] && { + opt="$i" + continue + } + [ -z $val ] && val="$i" + + json_add_string "$opt" "$val" + + opt="" + val="" + done + + json_select .. json_select .. } diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 7cf4212ac7..f6c7c90738 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -427,7 +427,7 @@ ar71xx_setup_interfaces() ;; tellstick-znet-lite) ucidef_set_interface_wan "eth0" - ucidef_set_interface_raw "wlan" "wlan0" "dhcp" + ucidef_set_interface_raw "wlan" iface "wlan0" protocol "dhcp" ;; tl-mr3420-v2|\ tl-wr841n-v8|\ @@ -458,7 +458,7 @@ ar71xx_setup_interfaces() ;; tl-wr841n-v1|\ tl-wr941nd) - ucidef_set_interface_raw "eth" "eth0" + ucidef_set_interface_raw "eth" iface "eth0" ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan" ;; tl-wr741nd|\