From patchwork Thu Sep 10 15:37:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1361662 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=R3ovQpOu; 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 4BnNPM37lJz9sTp for ; Fri, 11 Sep 2020 01:40:07 +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=6sKG2o14lMKDk93XFdFmqNoWiZdS1dYl3Ru7AC686bA=; b=R3ovQpOu3qBC09NpswZjXFcT5H FF0nd4y1WRt4H2r/tIcBYtsvkTyA5gboBX1ikNcSrA4zI8Kg6Urh8/qaHtVN5WIP3PrrFoN62cw+N sfmYR87sMtEOKIWCoFhbXavxffncnW9jSMTozOM90E7JXO4KOCsX3JU8bSl8qE2qU2tDeF/vyFshd lcRUwW3zBFiLc36R4DXlfvbeXvc1fUWF/l83I+gCLMkOpCzmAU+tL0eaQmAkYDSIf999GDHf42vWk iVuFzjwEpGP9q2JjvFqQsblIGH5aAnDU5ccCTW2viAReBeUhYpZScLTjWD1Y/h3WcEICcuUIIR/59 SuN4pnhQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGOeG-00047E-Uy; Thu, 10 Sep 2020 15:38:08 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGOeE-000464-5Y for openwrt-devel@lists.openwrt.org; Thu, 10 Sep 2020 15:38:07 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MeTD8-1kqpvN1JgK-00aVzW for ; Thu, 10 Sep 2020 17:37:57 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] base-files: drop default setup for vconfig Date: Thu, 10 Sep 2020 17:37:12 +0200 Message-Id: <20200910153712.1880-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:ieaJIyZgUw8X3H+5Wf1qmI3XN5mC1oMiqZxpXrPrAo4xV8gNPdQ mJETlFUb91VAn50Vupxhgs1hpuYejWvhAnq7ZmPN/Xq/rvOKFFRtOSK65TsU4ll9Knb2PFC HfSq4Heul+wrNGp8UExDQll+wX0KaA97xgnSHf+vUAHELmUkXm1MuFEB/KNuyl+wOYWisqh Jr5fF4zu64arD1GXIyjuQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:zh3O1jeRwAw=:IIALPF804Dbr21WYOhWAsW tqHsVRFET5aJIGvbN6vEO/+2mzRAhsi1WOnZ85mViKJi2hf62vocfu4/RX0jfalTQT41O3mQh VPQPPZEUiOcVFAbk4Vfmu6kaOvK4FragbHeHKC04/lONyH/M3gMsbKhIvWE8H11fB7kw6Q8jK R/osGlQQ9qFAzoBTIKOydCYOODGDJet5HX5Edo+RZYoB+uDRuym681JhwezI6FeCVBhh5lQrK 5RBrG2b6h4QUwqZPOOZSa75lpTjTfUfA6mxv3B6vXQlLf75U4h6x7oEaqqXau4HvdYlWSKLxf TV8MrV1pLSr249wd5hQfU2Z3ijAyEcDkfkDgkhuybTuCvdgPKEtTB6/66k7SuFuvrE+lhjbNz nE0HvxdINHv7nG1Yj0qM+M5jLUpzj51IMEYi+4R6ZIJQs7tIQtQfVtuV4uUFsErM++xK41aeq Cge17A5GikKLUlrCs5BGHCRb+e6y99uxpxWMVgpy+v/fHX27pjviwpnCHhD9dYffuLHO/qTMo 989MOE/SU9FLa7+VRSLhuuvMRcy+h3wjrhwMeqjTb5idHT37kNQL0k1R/KV6zztoRrD4opZQD 6nP5eSD9conq+0d/8/apFFZreWJHKqO4aa6/5b/NQd34JEuZ/tUfIQdCmZFmJU37aBMVMdQx/ d3PuL5CsayqxnzJOvBU5zuR2bXtI9sTWW6lHyINogU9A2gF0qcU7V1T+/Mm03HTFp7I31yAsq PZQFewLSw3ZSCjCDPFOeXxdmL1IeaTq3Ghwts3MF1C7NCbyZtLDnXfyUgvzUHC7htM1NVIp9x 6oIoA0ms+KJpT/DcJszj6KDKLUSnArPgJT/E4h73n1h7CQ5tEcLTvFVNh1gHFpADdsoMZgdpS C5oYDMi9g0uweNaBQWnQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_113806_422571_649CA767 X-CRM114-Status: GOOD ( 14.36 ) 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_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.10 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] 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 vconfig has been disabled by default since 2015 [1] and there are no remaining uses in entire OpenWrt trunk. However, we still set up a specific name_type for it during boot. While this setup is properly implemented to be only triggered when vconfig is present, it still seems anachronistic and unnecessary to set up a standard for a tool that is not used anymore. Therefore, this removes the set_name_type initialization and leaves it for those people actually using the tool to configure it as needed. [1] 899a23227e55 ("busybox: improve applets & deprecate ifconfig, route") Signed-off-by: Adrian Schmutzler --- package/base-files/Makefile | 2 +- package/base-files/files/etc/init.d/boot | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 2419849a44..73455174db 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=228 +PKG_RELEASE:=229 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 958a67599e..b36323a97e 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -20,7 +20,6 @@ uci_apply_defaults() { boot() { [ -f /proc/mounts ] || /sbin/mount_root [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc - [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD mkdir -p /var/run mkdir -p /var/log