From patchwork Wed Jul 15 13:56:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1329561 X-Patchwork-Delegate: rsalvaterra@gmail.com 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=gmail.com 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=tNUrZobN; 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=V1hdXlIN; 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 4B6Jrg123Rz9sTQ for ; Wed, 15 Jul 2020 23:58:42 +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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=gumqmvjMyg38wxWwt52IpwNzGS/o4IwQ2qHvMNKVE2Y=; b=tNUrZobN5NyDzvb9nBYhzBYhkv Z+JBh+jUgz42xIBmtRVE2DKP+BUWBC51QAecKjidGJhOmHz2JK7zNm/8KSUjQAeYxv+g+CMQxvJhp 8FU1L5gq6urKWjBbHUMNvgbX2tb+w7vzwX0unZm5OW6jcIarSf4QtxCGEUAnttL5UCyXEi3hRZ65u wQqp4jBJuGtXZ9vvBXc2fBSmyRg5lgMOUN4T2VpHiNf22lXDSFyx9BD/xwot70AysLGuqUYnKI7+a qMhEQXRunTgnPJ5Q3i1KUr1SFK8miWCXIAlSLBhhKroE0ZSuwoFcWIOsKjOuNbNGQQybyqIooD5in 7sJTYyzw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvhuC-0006DX-O8; Wed, 15 Jul 2020 13:57:04 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvhuA-0006DA-O6 for openwrt-devel@lists.openwrt.org; Wed, 15 Jul 2020 13:57:03 +0000 Received: by mail-pl1-x644.google.com with SMTP id d1so2422883plr.8 for ; Wed, 15 Jul 2020 06:57:02 -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=GujA91/RYHXpwViwcwrap/XZaBSQaQdt8OyHGksZ610=; b=V1hdXlINOelG17HqpVgOKXBuVbumwUjiXywWb+JAFzxAHR8HsXuLvLoxwfwYA5EWNH BeMlUUEs98MMQctiUrlgKXO1pDKVuzjY3KUoIfvX5+cFXvpIOqgCLvFHf87GPws430PV XsfvPHwYVqQ0qSpdco2b2pup+MEf4UJgjo59TuIxNu9ZJIAJaemyIu1h2ARVA1xO/iR4 VA0XhouD2tdZlS7jomCI2nCQ7vTCAlg+BfnpQ+aryh5U4ytQvYhW65waEKjsy/A/OQ+M TVHyA8wxgDMoi2wL1J0fk7GckuvvdinIt+hG7qWikGKqSQ7dzV6pMt+jdb2d9xql0dsw P/JA== 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=GujA91/RYHXpwViwcwrap/XZaBSQaQdt8OyHGksZ610=; b=ol1C6LIBDW7HUlwUHXNugFOkQzW27hYQ9zkD+fJC0EdrITEwvdIaqAUlBGTA1w1Inm Awdxnf0cNB0zvBZ9vMmxiSfXM8J48+SYlR0OeVitcDUzQtqZEcIz72HwGb8loiQ5BUty mAIWFwJVAxLeDeTTLBiiisv80Pff3E7TYPS6JD0+NxORmCzJbQ+Xiuo0Lr0y4Oit/VY7 jLZl5U1Il3km+ixDZfAlHvBEHC0bwZ9nidqpRhEAYKGNyuJb7gj8HXJQIADpQlNBL/dW lmIHCLpbAXob00inzLXdhyuZJTA83U2HtEiPO9JiT+7n5SAI5lHQfyJ2KIYIaIKO1Enj IV6g== X-Gm-Message-State: AOAM530+6bn0rqV/CGwkocpKH7hE/zv0L5iJ/mjzGned4dHlDSkSsCyi 5oYUBlHXcqprbrhc3mZM8zfgO2s= X-Google-Smtp-Source: ABdhPJxof/9oi5hf06ahUcwtOJNj/9WmV9asTCRvUByipT/4t2iUzd1JU6MHjAFNhcRPbMOvL5synw== X-Received: by 2002:a17:90a:f493:: with SMTP id bx19mr9590048pjb.134.1594821420525; Wed, 15 Jul 2020 06:57:00 -0700 (PDT) Received: from presler.lan (a109-49-8-134.cpe.netcabo.pt. [109.49.8.134]) by smtp.gmail.com with ESMTPSA id z11sm2321343pfr.71.2020.07.15.06.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 06:57:00 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] fstools: disable swapon/swapoff symlink creation Date: Wed, 15 Jul 2020 14:56:39 +0100 Message-Id: <20200715135638.48786-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_095702_800988_760716CB X-CRM114-Status: UNSURE ( 7.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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: , Cc: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The swapon/swapoff applets enabled by default in BusyBox have more features than the ones from block-mount's block app, which makes them redundant. This patch removes disables the creation of the symlinks for the swapon/swapoff block applets. A follow-up patch will remove the applets themselves from the block executable. Signed-off-by: Rui Salvaterra --- package/system/fstools/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 6b813cb433..ed0b3a7a80 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -114,8 +114,6 @@ define Package/block-mount/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblkid-tiny.so $(1)/lib/ - $(LN) ../../sbin/block $(1)/usr/sbin/swapon - $(LN) ../../sbin/block $(1)/usr/sbin/swapoff endef