Message ID | 20210531063509.18305-1-zajec5@gmail.com |
---|---|
State | Accepted |
Delegated to: | Rafał Miłecki |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Authentication-Results: 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=kMy+xlLR; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mHyzVYzt; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Ftlw23bSLz9sRN for <incoming@patchwork.ozlabs.org>; Mon, 31 May 2021 16:37:38 +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=sm5x6rkqY+Bq8N+deWPZDa/8ZHPH3TnucHzRKs5eqlI=; b=kMy+xlLRi2IA7k i+Gyq2RThXH965a1wPoqw2sHKO7Wc0x/TElAVt4ze5NIsFlymAgfk2y+MFUIkBZFYG6w7KYqE91gS z1x0UDjBEKLTUwJjxD9a2IXcpf5+hYoPQ9bSdtBzQvIc2zplvaRK8EAYruA7bZHUMckKVq48uAMlO DDIp4MVU5YwBowIhHnEYphoiQ9g265TY3xHRmf+aulN5v0FflcsE7GqtPL99XatZ5BaRUJkZKNoDq Gg4Bb1od7kqxVA5EefdwK4JPjTeBRxhfnLk3+27zsA+Iv0EKihpeHF5XlyOh5fX/EtxWEfr/72Ct8 lqkjQaiq3dpASizeMrkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lnbWJ-00Ayfe-G5; Mon, 31 May 2021 06:35:27 +0000 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lnbWG-00Ayf5-03 for openwrt-devel@lists.openwrt.org; Mon, 31 May 2021 06:35:25 +0000 Received: by mail-lj1-x231.google.com with SMTP id v3so1935707ljc.6 for <openwrt-devel@lists.openwrt.org>; Sun, 30 May 2021 23:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xDFafVZ0Yme3bvhkUKKgDWHAL6xRM6jtbkueEBzuR64=; b=mHyzVYztm1xjd+h+oCznZp9HTiI1BKXQEMyNnFqgHL+wKTG89reiCIim0HDKcgMCvE /YkYcjCoNV2mv6kpjUd6Q4w++WdxNPmCsl6qROQk1vuGAbP1ZgYICvS2i8NYUOVYdPMO dWxtgb5MlkEDo1ZYEhysPiI9wZBR/W/+xXzvlBT8BC2t5xPaPF6qBlO6938R/MiyipB8 DMlKGhJZI99GqQRRD027FE5D3dNB7I88VXTdIN2fE7R8jgggm9wy4u23+6BYp7l2uABf 7WqQUr9yORW8TqZIOqIKxYEecPR1v+uNB2HxEcNUL28f74tyuLycYGHiaX7Ri2qk+EM8 vYXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xDFafVZ0Yme3bvhkUKKgDWHAL6xRM6jtbkueEBzuR64=; b=L+h3hTcsmdzQfCd/QMtcU3ldt/kZUwxcKjZbFaU8YpKK4AebXjDJ4xODh+vFf1Z8xM Enos5hg8uOyNGspXfVmdOjYONq+naqhkSyMBuQAk69njty1vA+345gFS4RL8fLy4tc3a 3AIpz+zOZPP3levn4XybRKxeUITaQVKA+XF+YeRdXq1+R76qeJiBWJeiXfXJN7MSWW71 XG6b5EyS07BGHVWDBRt8PjWPUq1pcNC8XjYW52+4ezCcNVt5XhFmzUw2F/7EFpFV42lm O/oPtA4Y2dQs1y1Vq8Pi2YTOSmDmaI6vTqoTm9wyisUhfPr4HWU0R28uy7nCQuLyozJi jbFQ== X-Gm-Message-State: AOAM533truL3sAeLeYwhrBq42bCd0L4cN+8Kocr3hI9lZ4Zqd8V2BkEt eFHnBOkZOdAh2yfFLcckuwY= X-Google-Smtp-Source: ABdhPJwb0DhUYLF1AqIcxCUhAQiOhl/QgGhotZnNaSGSp9lTUFQGS4duDWN7VwVaucBXuH8Shi3MMA== X-Received: by 2002:a05:651c:2042:: with SMTP id t2mr15705375ljo.294.1622442922340; Sun, 30 May 2021 23:35:22 -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 w23sm1591008ljh.126.2021.05.30.23.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 May 2021 23:35:21 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <zajec5@gmail.com> To: Jo-Philipp Wich <jo@mein.io>, openwrt-devel@lists.openwrt.org Cc: Hauke Mehrtens <hauke@hauke-m.de>, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <rafal@milecki.pl> Subject: [PATCH luci] luci-mod-network: migrate macaddr during bridge migration Date: Mon, 31 May 2021 08:35:09 +0200 Message-Id: <20210531063509.18305-1-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210530_233524_082950_95C133C6 X-CRM114-Status: UNSURE ( 8.95 ) 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_Link?= =?unknown-8bit?q?=3A_https=3A//forum=2Eopenwrt=2Eorg/t/network-migration-21?= =?unknown-8bit?q?-02-0-rc2/97934?= =?unknown-8bit?q?_Signed-off-by=3A_Rafa=C5=82_Mi=C5=82ecki_---_=2E=2E=2E/htd?= =?unknown-8bit?q?ocs/luci-static/resources/view/network/interfaces=2Ejs?= =?unknown-8bit?q?_=7C_4_+++-_1_file_changed=2C_3_insert_=5B=2E=2E=2E=5D_?= =?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?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoyMzEgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?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=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=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?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=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?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=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 <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
[luci] luci-mod-network: migrate macaddr during bridge migration
|
expand
|
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index 5d7f237bb6..07627c4aff 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -326,12 +326,14 @@ return view.extend({ tasks.push(uci.callAdd('network', 'device', null, { 'name': device_name, 'type': 'bridge', - 'ports': L.toArray(ns.ifname) + 'ports': L.toArray(ns.ifname), + 'macaddr': ns.macaddr })); tasks.push(uci.callSet('network', ns['.name'], { 'type': '', 'ifname': '', + 'macaddr': '', 'device': device_name })); });