From patchwork Sat Sep 3 12:31:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1673842 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Hm/gugLh; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=VElaQUBq; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MKZ2j1S0nz1yhd for ; Sat, 3 Sep 2022 22:33:48 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8vD1YzCkuvsJJhE1ivzTeWKg53xgThDiXUJOzyWEmJg=; b=Hm/gugLhkfe+5B 0FKFGIqorDlhZMFe4sbNcJ9mnqOqY1IfstjWZnF7Bw5O1l/NQwXEb4r/XrR3ZPgGv4S9yCau97L0C XbP82eQbwMfg4zCntyLPrBE/HXlgDW+JOmcd2VZ2NWd3V83BG+BmTYVDgMQwmADWjN/lkjooqLFuU 5AqW9Oz3oIMeOrH4EZQiQCVfucS1656v6AYeKlHBe1wHrJVE1vImOvYepiN6CKz0u8VMTxZ8DcXZX GUTmOUQPCsRyFGeWeHu3i2Pf7f0h7t0KEUS5442S6+f2JpAFHZ4wZa97tj/3kkqwICeMXBwMIEuSC cGZ5hIaVqLaV8UGrXqww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUSJH-00ASYk-Dm; Sat, 03 Sep 2022 12:31:39 +0000 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUSJE-00ASSl-0S for openwrt-devel@lists.openwrt.org; Sat, 03 Sep 2022 12:31:37 +0000 Received: by mail-ej1-x630.google.com with SMTP id lx1so8528357ejb.12 for ; Sat, 03 Sep 2022 05:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=Tn5hxrb4dSF2sfDVfxcOCtaYrVR1gOkZNHCy8pckZ5A=; b=VElaQUBqtBuOusFMhP8Vz+8FeXhCRc0IjulCsO9ZuAdLSEmb815B5c+N4Fk2Y0Z+qt zD8HJFtaUFTRAJgYuZBWyYuJCK69vTS03ZWdW5o9+JTuG3FNLzM0Gud3P096lguj6jBb jxQahUV1SImr/Nzgzx9nrSj1OkKzLCHhJLJ4ADiYba6IekSu7221Dh0VdcWEm0p1Khuo LaY+55OAj9y/QHk9OVJe3PkeR97dHwqo9yTHn5815PHRCVQKMlvXTM1bfIWL63l8ElEm HyodX2hUM/829r0cw791sG1UEek/kx6N4D0oUbhTGxCmP8d+W1ZGMgO+fsEXTM4mHkBU GC3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=Tn5hxrb4dSF2sfDVfxcOCtaYrVR1gOkZNHCy8pckZ5A=; b=IK9L1zNNbMTnKIvsRBFwUs5Fc0egYizPNfSIES19U+AF5K3PxcKT4isyVDKC1CkCSY xq7/Ra8F8CksdMvGXa/0gOjEYO8FTHMA5ma2K4WOUsMGlvvk9mcO8ZRB21J6LHtwVyEA +QXlRjI2bdEBeqykMZFbi+ayzkF5wb65N//u3LGjn1bfuNxHET/P5OwcoPI3/iwBePzX fzKDQh6wsOcbF5tXGDeJ3NzS/Td/7To7ljRES3i8H+dIb4KQq9JPjJJVYYMQ/hhXY0Ic momR4t+RqdH+iPp91vsFX0BvZc/TY4HdffuI98AuETMzBE6Kktk+z/Qa6PiI6gBsDUGl FoaQ== X-Gm-Message-State: ACgBeo1kTGiSWXFVU0EmfKVouCyybnWh/EFVhZVIYGYf/YbQGiKwA2no JX1zHlhpnlLOen3WEQyQjcu9gkfwIFY= X-Google-Smtp-Source: AA6agR77slKpgJTqjsQ69no/GzRYXrwTzmEvYth6BkmOmFByQ3wuO1nXSFZU9LtM1AhFAiaLckqv2A== X-Received: by 2002:a17:907:8a1e:b0:731:39b9:e00c with SMTP id sc30-20020a1709078a1e00b0073139b9e00cmr30679512ejc.65.1662208292908; Sat, 03 Sep 2022 05:31:32 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id c12-20020a056402158c00b0043bbf79b3ebsm3187581edv.54.2022.09.03.05.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Sep 2022 05:31:32 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: Jo-Philipp Wich , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH] base-files: support "metric" in board.json Date: Sat, 3 Sep 2022 14:31:29 +0200 Message-Id: <20220903123129.5713-1-zajec5@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220903_053136_093282_A10D4D1C X-CRM114-Status: UNSURE ( 9.33 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_It_all?= =?unknown-8bit?q?ows_prepopulating_/etc/config/network?= =?unknown-8bit?q?_interface-s_with_predefined_metric=2E_It_may_be_useful_for?= =?unknown-8bit?q?_devices_with_multiple?= =?unknown-8bit?q?_WAN_ports=2E_Signed-off-by=3A_Rafa=C5=82_Mi=C5=82ecki_---_?= =?unknown-8bit?q?package/base-files/files/bin/config=5Fgenerate?= =?unknown-8bit?q?_=7C_3_++-_1_file_changed=2C_2_insertions=28+=29=2C_1_delet?= =?unknown-8bit?q?ion=28-=29_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo2MzAgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki It allows prepopulating /etc/config/network interface-s with predefined metric. It may be useful for devices with multiple WAN ports. Signed-off-by: Rafał Miłecki --- package/base-files/files/bin/config_generate | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 596fcf41fa..38362813d1 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -96,7 +96,7 @@ generate_network() { json_select network json_select "$1" - json_get_vars device macaddr protocol ipaddr netmask vlan + json_get_vars device macaddr metric protocol ipaddr netmask vlan json_get_values ports ports json_select .. json_select .. @@ -154,6 +154,7 @@ generate_network() { set network.$1='interface' set network.$1.type='$type' set network.$1.device='$device' + set network.$1.metric='$metric' set network.$1.proto='none' EOF