From patchwork Thu Jul 30 15:25:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1338919 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de 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=merlin.20170209 header.b=juSfm6qn; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4BHZ7j3JM5z9sTR for ; Fri, 31 Jul 2020 01:28:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; 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: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=1B+UO7tKkKi4MfZv2TGVY79Uq2KZxdTf1hvN6QdjYQc=; b=juSfm6qnCkkhRk+xYosvsEYNK3 1o9x/qLBmJHXBmFDLq+ClV6Q9kNos/gFf9xnDl6FlBBBL9WYjhJzzVMxzueCYxOWrVSxuYs75Lhly /mS+eaQiPm784N2s5nPIrLI6juZthpgXSEZtG/+wKVtxuwVVsmlfG3KwVkbQMaxHZXtsv78gLumfs l6rVZ9A857hosa062D2cFTsqdCl4gdG1tQGKZlO8NiE26H6IKKSTRFTM4Hb0k89OyJ1ZHG0Ft0pT5 W+RjZQnPVLByCVqe000I1LQeLHZmQ9Z+6JY2p/AnAnHhmpkuZmq6BqdgDq90mPvdLDJp/FWiG1UOH n/AJV7Dg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k1AS7-00015W-B2; Thu, 30 Jul 2020 15:26:39 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k1AS3-00014h-F7 for openwrt-devel@lists.openwrt.org; Thu, 30 Jul 2020 15:26:36 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MbBUc-1kcR4w1qRs-00bbj6 for ; Thu, 30 Jul 2020 17:26:30 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] target: replace remaining occurrences of ifconfig with ip Date: Thu, 30 Jul 2020 17:25:20 +0200 Message-Id: <20200730152521.51782-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:REjCLrUoGGx9vwQIgGaxrsB2cCElJKQTY67crkXmjXZkNN1EPiF Dp6NwCOlyZZsm/Fm8xE2jzNOch1JpI+Vut7Xyl2HEKaPe3T6c9paweTFYeByQEL/zmsw35Z kDRCcqOqBsHkWGQTlrvNshOvcLYRkcK8UGECp/7qzFSKG2axQmEAl2Wslh5H4LY05tpVnId 9M3mOLkLR2t22Q/tWlwUQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:WUUIHV/NI+w=:Hay/Th5LNtKb+kOeWPyTso qS6MfYzM+JAmihHPblNRow0+zVytBiRMGIIAsKFDu06E2RoZhEQ/P/nLLYOMvxnupJduZmeZP dXzQWXMDaclNm2zYEII5nO5tmGbp24R0U37au3gjx/fE1lVjPuZXCztPDlk6yPca0isZphn2L cZUQ1c3PjoTzM3Vk0qYYVKII5EB8u24yaXzQRXQUh4b8cPwOnlbLCNtnA156Pp8t3HSrh7rnZ h4s5ZOrYkDyjqMu5aTLNvu52IyKQIMSUaihwdh68xnHV3UMQU+TpFIdykLzXEAAZn7okr3sAI WSR1lOJbm+HiltGPemY0dD2uGj33aN55vL8aYbB0hXNgfTl6gKje77FSnvBoqi+z/YSAouxex I9wJYOPSsNqamfNk2G36jilUsE+QEbYq0LPSFx0q4yQSqyH8uDAfNSp4jOrqVv+mnIyYWBbd2 8ZgmiPJHJGT7n0bu/820xs57H+HD3cGevWcYrCbP8w/bQbUz60VzZosGxxryf04AmsLrhzELZ 0suI0SZ9upe8hf0+TnNYhTq56p/W2i6ZpjJR+gXeEfyjMUYXboQV9BAuOGzyanTeOl4jMipmm Jd7Aiy7P5sWLx/evQq2xIwz+gT9LYebB6ip4ZgX93rIShandx0b9B7ENeIWs31nZZqDeAUaGj G6osBYyrRNRvfZRPtgiY7XzTpd8QLB04wsXwq3P30OQxfJGjm/wzaxF9dBENKLlR4fW7zqjPX s+uJvAqtFL9OLBtoB4Ty+WahFyyYWPuNjj0HUnJAuoeuLJ6rjj09EBmYm392kV0rlcdBDILFE 2ITAXrMuILY0XqbaTshf4aAju6C8v6K65ynHXFbRoLo0CyENQNcoBzJ+lhZf7LsKRlBdi9puX 4qIdUI6c5Yl32XnJ5zYA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200730_112635_742891_A8D27716 X-CRM114-Status: GOOD ( 13.11 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.24 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.24 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 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 ifconfig is effectively deprecated for quite some time now. Let's replace the remaining occurrences for our target setup by the corresponding ip commands now. Note that this does not touch ar71xx, as it will be dropped anyway, and changing it would only make backports harder. Signed-off-by: Adrian Schmutzler --- .../base-files/lib/preinit/05_set_iface_mac_apm821xx | 2 +- .../base-files/lib/preinit/15_preinit_iface_atheros | 9 +++++---- .../mediatek/base-files/lib/preinit/05_set_preinit_iface | 2 +- .../base-files/lib/preinit/07_mt7621_bringup_dsa_master | 2 +- target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx index 1f8c1c29fb..5f92c01931 100644 --- a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx +++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx @@ -5,7 +5,7 @@ preinit_set_mac_address() { meraki,mr24|\ meraki,mx60) mac_lan=$(mtd_get_mac_binary_ubi board-config 0x66) - [ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan" + [ -n "$mac_lan" ] && ip link set eth0 address "$mac_lan" ;; esac } diff --git a/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros b/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros index 6b77f393a9..235ba4befc 100644 --- a/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros +++ b/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros @@ -5,7 +5,7 @@ preinit_ip() { if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then vconfig set_name_type DEV_PLUS_VID_NO_PAD - ifconfig eth0 up + ip link set eth0 up vconfig add eth0 1 ifname=eth0.1 else @@ -15,7 +15,8 @@ preinit_ip() { } fi [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up + ip addr add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $pi_ifname + ip link set $pi_ifname up } } @@ -26,8 +27,8 @@ preinit_ip_deconfig() { if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then vconfig rem eth0.1 2>/dev/null - ifconfig $pi_ifname down + ip link set $pi_ifname down elif [ -n "$pi_ifname" ]; then - ifconfig $pi_ifname 0.0.0.0 + ip -4 addr flush dev $pi_ifname fi } diff --git a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface index 8d282818c6..f39e8aee8d 100644 --- a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface +++ b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface @@ -1,5 +1,5 @@ set_preinit_iface() { - ifconfig eth0 up + ip link set eth0 up ifname=lan1 } diff --git a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master index 9a0da1716d..0f4660d242 100644 --- a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master +++ b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master @@ -14,7 +14,7 @@ mt7621_bringup_dsa_master() { ;; esac - ifconfig $masterif up + ip link set $masterif up } boot_hook_add preinit_main mt7621_bringup_dsa_master \ No newline at end of file diff --git a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh index 6ad8f57620..cc0c67acc7 100644 --- a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh +++ b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh @@ -4,7 +4,7 @@ do_b53_hack() { # hack: enable switch on Lamobo R1 and reset counters case $(board_name) in lamobo,lamobo-r1) - ifconfig eth0 up + ip link set eth0 up sleep 1 swconfig dev switch0 set reset 1 swconfig dev switch0 set reset_mib 1