From patchwork Thu Jul 30 15:25:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1338924 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=XVdH1DUA; 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 4BHZ8005Csz9sTR for ; Fri, 31 Jul 2020 01:29:04 +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:References:In-Reply-To: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:List-Owner; bh=j2SMJzlnVk1bG/DFsFT7WLVfjFy059pYU9AQwju8yNA=; b=XVdH1DUAHN+aEhReovdU5U+Eue I04A+s/+0Sq+ATum1QqEaedrQCox+3jzhHYnyLbCVX3ThgV28V/xs82QLBwR1X4I8MBJK2f2JwfHx 0piGwXbS/ydOckvGgW6l/+cJFQCgm0pP6AM+jLw56nLQnu+Fx2sdpmvNu9h43rvgXEp959vcMQp+s IQtTsyDVQgA7pmRdMpP9nXx/x23t9zKYQpMS+rtPscF8Te4/fd8YWaaq1uq1Jo3d/OKs/0Oqm/sai gcYarL0KR/LLqou075PLdFqUIRwmzGd1SZnIQEC476QWhHSUNeu6HX8cCLaPvLu/YU1iN+FiC7nbx 2csfKmKQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k1AS8-00015k-Uo; Thu, 30 Jul 2020 15:26:40 +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-00014i-F7 for openwrt-devel@lists.openwrt.org; Thu, 30 Jul 2020 15:26:37 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MQdMG-1kNesq2LGo-00NfyI for ; Thu, 30 Jul 2020 17:26:30 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] package: replace remaining occurrences of ifconfig with ip Date: Thu, 30 Jul 2020 17:25:21 +0200 Message-Id: <20200730152521.51782-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200730152521.51782-1-freifunk@adrianschmutzler.de> References: <20200730152521.51782-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:pBhDkGqMpr8lKRuGh3MSduaa2ined5vZYuTcLHPZQycUy7f0cT+ kDBQOE6OWUFritO4D//y5ZztTd/pQzmz8mxrZfBWkURKbjeH9jHzuL4innq5INqJ8kd1CqY h+225LM8ruv3i01rfIWz4Sj1TaEFQZcHj7CuL6H9KkJVlN1547HrI2Q7ZoEomMMKmVKfXMj V/rGxW6B/Pl7tqWvzXHZg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:RfdUzoXrKMc=:d9HssbblBN/SXka/CYYkGr 0XUONoD5qMW4mvvD8JYDqcoZ1l8p/yYC9hcusszcanWrXICX3jJ9qOvTvU7t4Gohw6Mt2RM9f sDYIk0RYHsADeR+zyaHXSHy2ErB1PShOaWPOYRZxqYofFsyLWuPcygABSDPVa4fG+JlkACHEz Js8YIUTLtt94xTjLX0ujv8yt2X3VYWG5TeubLRIwXh3N/r/rPk2grZaLtvHBCpYbp0xkvMRqJ daFLBkuShAEGOCytyhaaKcRo2FTXH34rkTcRB0rWNg9Pt+tOHmq2bl/tbQH7MBcAZ99IilnZr qL4YaFJ3mAGCWFWhkvwZQlmWWJGNvKs3q1JfqcJlYFJmWf/y2h1iLFpKj6bsv5sNeG4B5ExR9 uwx9p00FxzvEaZko4IfO034f7+xsQFW4mRRdQgVClIgNCoXVqCahuUL623I+zPdxZ3VfndxBV ByiVSizfvtWt5iM+oyjQz/SmAQGNqA/f/WfKcX7EzPRdXlwzmIJTSk/QwbmjqBbI3Lljb6ZOq 93JCfKi2bVwXcVicayc5XSlOM3mMSgy9l1MO8DMAGdR3hiU9blm4BP1hSKkhVhTanXoDklF4j Rx/v64V6vhkwXzWl3IjQVbdQ85oHPVanm31OcORafuSgMYfkpCZZoqIydFqP0rzbaBtZDwGnl jzZiVquLoN/l3Nd8q260z4k9sRRY/8YN/B3iED9NRZ6P4g5+2M/ehsV7KHGwD9/GDVlON3l0L FV11Lbb/FbGY93RNXzKHyArt1LmXrYhefAgtx7QdKml9Yeyf2n+GzPzg80hJftXvG+whswX3z Kn8/T4j9+Td6FnxtrJnpS5smgMvn9TqnLr/uUN7E5arg/2ua5BMTGIcHLBOuugsluPXVfEYCz /B1DeInj+JIP7DaqRKWw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200730_112635_750207_6C016611 X-CRM114-Status: GOOD ( 11.25 ) 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. Signed-off-by: Adrian Schmutzler --- .../config/netifd/files/usr/share/udhcpc/default.script | 6 +++--- .../config/qos-scripts/files/usr/lib/qos/generate.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/config/netifd/files/usr/share/udhcpc/default.script b/package/network/config/netifd/files/usr/share/udhcpc/default.script index ac765a6363..0a9eb0180e 100755 --- a/package/network/config/netifd/files/usr/share/udhcpc/default.script +++ b/package/network/config/netifd/files/usr/share/udhcpc/default.script @@ -14,8 +14,8 @@ set_classless_routes() { } setup_interface() { - echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}" - ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+} + echo "udhcpc: ip addr add $ip/${subnet:-255.255.255.0} broadcast ${broadcast:-+} dev $interface" + ip addr add $ip/${subnet:-255.255.255.0} broadcast ${broadcast:-+} dev $interface [ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "255.255.255.255" ] && { echo "udhcpc: setting default routers: $router" @@ -41,7 +41,7 @@ setup_interface() { applied= case "$1" in deconfig) - ifconfig "$interface" 0.0.0.0 + ip -4 addr flush dev "$interface" ;; renew) setup_interface update diff --git a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh index 024be0c170..32f15581f8 100755 --- a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh +++ b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh @@ -326,7 +326,7 @@ start_interface() { append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate:$qdisc:$filter" "$N" done append ${prefix}q "$(tcrules)" "$N" - export dev_${dir}="ifconfig $dev up >&- 2>&- + export dev_${dir}="ip link set $dev up >&- 2>&- tc qdisc del dev $dev root >&- 2>&- tc qdisc add dev $dev root handle 1: hfsc default ${class_default}0 tc class add dev $dev parent 1: classid 1:1 hfsc sc rate ${rate}kbit ul rate ${rate}kbit"