From patchwork Fri Jul 24 15:07:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1335798 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=I3ANdvTm; 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=PpUeFyBg; 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 4BCt0d5f7Yz9sRN for ; Sat, 25 Jul 2020 01:09:53 +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=nDy4y/oYMMuCbO4UOVUleWKbd8oCPcMb8AGgBeafKSM=; b=I3ANdvTmwiXEPwTGyJtTQ/hoMX PxfeLuUHEl4lohfyLDuQj9+EeugCwTLH9oPCMOpCn6eZCFy6viyJ9/NcOSf/tcD33yVoiR+8g6IGs dh8VHrmGyq3grN3uGBLroe8s1e5drm4Mqe48Euzg+Q7IUUGFwg3/ssjYg3FzvTLuaOjFzDfvFUmBw kJlUDNVmzrgsn4Yas3N4a1CoIhmuC7IiHwVrnsez0o+HJkGmjBkWpFVaOTAywrIvaMkqZJfVIDNju MknYJrzelUIF2cedoaEj9z9yBvTk/DPWCFOYo52EpnuNrdIo2KAc3jvqFYcfTlkj5+ji6MohX+G50 LOXjAX4w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyzJJ-00035E-9w; Fri, 24 Jul 2020 15:08:33 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyzJH-00034S-Ef for openwrt-devel@lists.openwrt.org; Fri, 24 Jul 2020 15:08:32 +0000 Received: by mail-pf1-x441.google.com with SMTP id 1so5273869pfn.9 for ; Fri, 24 Jul 2020 08:08:31 -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=iu+iJGrpAwSBTGQ16lzd21/UL2erN9/lz0uPWAut/vg=; b=PpUeFyBgvxahieNbGlhEE/n4ng8JuLVjqmmJdIGOtgERnam7UsbKfDvl6cVX7y3OVT LmKsh5pNzeGd8iqybZtOxHwkx3Zta1ldIScsY2enQEYZGU9MNlkdlkSlmasZmj5X0tKO ocKDt11ZMkpt3j4y1eqyaS9WIVnc+Mh1JIvT22+tVLVUlrQUPoL9RKCgJz0PrHi7/gbh LGJ2GRKiKkZaAokJQ379y63gjriaTEW7iJTCvCdy58kd04EnMNfoFPjXW4bO90AQkNzd ENQVw0/psbDxtiJRfqzR3NgT938BJxGBHIzdNQMStMG/Zbeby06WTMfQiwu09f6p8i03 3a3A== 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=iu+iJGrpAwSBTGQ16lzd21/UL2erN9/lz0uPWAut/vg=; b=MmlAmHG24xR065FVJ66RPMIiE7VtxYAq/zipEj1GRP+ozCjRCgCSFhodq63M3AC1VI lvZgSUJ68BV91Ab6TgCgdYe65VOtxysYb8vmQfUURlEZiMODXyEIijRJvTdc/fsOejOA tPCcP7br//iKUY0Yc+86nBGCWi1w/ESAWXu5CoEG4Lh4oB6yh8dL2ZxIamoBU64UjdSa ObKKztOPK29FRzPE1iAwcCqQJNwn4h3ne9JBFvqdMJpknyD3pHvksvgufXKLtOg2icnR wD7OmWHhRLKAw3Ih+O2b7vTUO1diqlDne9oyHIMv+SJhefuO0EsQUwgmRWWABPd6SDfr K2PQ== X-Gm-Message-State: AOAM531E66CMFHvW1MXvst9mNJza0QYNags9FdyvpKC9sn91xI/rM4lp zQSK41kPUCSzLu1Nx8gemGC16eoK2A== X-Google-Smtp-Source: ABdhPJwbvF36OQxvX7vkRzgq3EnrCd0AK7LeBJtyL5Wl6EpxzkmDgwwIS3YdvlLb7kktjey1RQo7Xg== X-Received: by 2002:a63:7c5:: with SMTP id 188mr9174288pgh.48.1595603308788; Fri, 24 Jul 2020 08:08:28 -0700 (PDT) Received: from presler.lan (a109-49-6-66.cpe.netcabo.pt. [109.49.6.66]) by smtp.gmail.com with ESMTPSA id kx3sm6093982pjb.32.2020.07.24.08.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 08:08:28 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] zram-swap: explicitely use mkswap/swapon/swapoff from /sbin Date: Fri, 24 Jul 2020 16:07:59 +0100 Message-Id: <20200724150758.15309-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-20200724_110831_522550_75754E2A X-CRM114-Status: UNSURE ( 7.64 ) 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 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.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:441 listed in] [list.dnswl.org] -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: ynezz@true.cz, Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The required BusyBox applets are enabled by default, so we can rely on them being present in the system. This way, we make sure there are no conflicts with less featured variants of these same applets which might also be present in the system. Fixes: 0bd7dfa3ed60588ec83a8f60f48b6991ebb16940 Signed-off-by: Rui Salvaterra --- package/system/zram-swap/files/zram.init | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init index a6126e578f..f31a87438c 100755 --- a/package/system/zram-swap/files/zram.init +++ b/package/system/zram-swap/files/zram.init @@ -35,18 +35,18 @@ zram_applicable() return 1 } - which mkswap >/dev/null || { - logger -s -t zram_applicable -p daemon.err "[ERROR] 'mkswap' not installed" + [ -x /sbin/mkswap ] || { + logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox mkswap' not installed" return 1 } - which swapon >/dev/null || { - logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapon' not installed" + [ -x /sbin/swapon ] || { + logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox swapon' not installed" return 1 } - which swapoff >/dev/null || { - logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapoff' not installed" + [ -x /sbin/swapoff ] || { + logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox swapoff' not installed" return 1 } } @@ -181,8 +181,8 @@ start() zram_comp_algo "$zram_dev" zram_comp_streams "$zram_dev" echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev" )/disksize" - mkswap "$zram_dev" - swapon -d $zram_priority "$zram_dev" + /sbin/mkswap "$zram_dev" + /sbin/swapon -d $zram_priority "$zram_dev" } stop() @@ -191,7 +191,7 @@ stop() for zram_dev in $( grep zram /proc/swaps |awk '{print $1}' ); do { logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev" - swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming memory back" + /sbin/swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming memory back" local dev_index="$( echo $zram_dev | grep -o "[0-9]*$" )" if [ $dev_index -ne 0 ]; then logger -s -t zram_stop -p daemon.debug "removing zram $zram_dev"