From patchwork Fri Apr 24 14:04:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Ryazanov X-Patchwork-Id: 1276409 X-Patchwork-Delegate: ynezz@true.cz 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=2607:7c80:54:e::133; helo=bombadil.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; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=Urm/Vp22; 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=BMDVfYE5; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 497wwm6gzyz9sSM for ; Sat, 25 Apr 2020 00:07:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date: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=ExfP/D2n9IN12tXgEcIgt3SiPa84k9TQBIdzPzlxi2I=; b=Urm/Vp224NwYvi 2yKsX4RYcXHFgY7Y9cVlDR3gtNOejgr/UzPWqFserDN8SiQAaBGfLz9LRzYz8FgRS92MpjUYPn8ub g71Lvng2HXYGKw4xCVU/xd8gFyz30ABzHivGLECNB2Uftj/uutTQYn5RY5WnVsttz0IpD1f9J+REw 8f9bskp0Mm6TRD1o+nUTrrvz2c1336PGHoeB0i0ukE+G9kvI7QhGafv3oG1jmZcUhpmMM52GIhB4s S8uXzO8rBpO/FpTzsJI+E0IkpcdAy7d8k/X4cCBhuO1j5R06QbZknYpS3iUlC4gG/8MNAMQcpR5Nu XySbOYeOmNYizJtWAGMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jRyzN-0000sa-KS; Fri, 24 Apr 2020 14:07:33 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jRywK-00040l-DK for openwrt-devel@lists.openwrt.org; Fri, 24 Apr 2020 14:04:29 +0000 Received: by mail-lf1-x132.google.com with SMTP id j14so7777927lfg.9 for ; Fri, 24 Apr 2020 07:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=2W9aHN4mQm+/pyy79zBAEdu2lp4VHW/iFU85KWPBDuw=; b=BMDVfYE5e1sX0ZCgD6J9GZZ5KQ252ewjFK4lMRpOk7ml7hFGrP/lhx2arJOAVJLT5c T1vP5aTPrKR3pnSf4YqehNXOEy1j2Q35RNsa3rDLNb0T3vgUddfHeOBRpeLaH39sQzQi irffF+InyX61sasrzU0YYHzw4nM9eWK2TEQXhE/YfDTb9wTBCaaH2TgYB0BfIGn5YYln vsbTgrkOx7r1iiOeHuPStOCv/WxIp8pZio0zYY7ymXDEI/byP4rUrquTwK2+Gt4pp0Zr gnmVP4gF3FXM5Cerc+VnoFfwTmsnyPiE58PMhgLB1djPoesoOu6I8CiK616RUOH4UpAO za3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=2W9aHN4mQm+/pyy79zBAEdu2lp4VHW/iFU85KWPBDuw=; b=CYrQLyCsFxP7QMhrg7GRcUDBaH08A3J4f15cq7qz5NfoT7CRoimzuKkSIO7P9bqxrj Qwt4y43YmgzuryxuQQ03Nz88CIr3d3h5WGTKJ0pUDfV1J7YQMPTxx2RM4Y0wZ+8xgMCK acrg/6IWLP8ceiLpSUKLSiTRK/8UBuDxdLkE7gu7ggWvPk3c0Ham+lmVBw09lfBE9/vr 9/UrxTP7Dc+18BSEKWnOocThhbD1uDjGjuYRxBEHOOZBIuRwcIalygPJyb1X78zxXZj+ PNXYeKD49YrmL4QvoIsAVlPinnkGM4dhELoHJ+CjJCUmof9IiR+kug9ZwY2erE+mWN9q O1xQ== X-Gm-Message-State: AGi0PuYK6UmeiU8tmzyxt387SyK/I1NRz4LXE2a8I8LzQoGe8niRt6jb cls0wNCSodfuvnsWS5oxqPAIz9Om X-Google-Smtp-Source: APiQypINlcCPx3s19GLMpSBCdXMrFTvKCJRKMChdUyiDb5XBYPmWE9me0LZnf6Ib6jdWDeF2HMx0rw== X-Received: by 2002:ac2:41d9:: with SMTP id d25mr6384300lfi.204.1587737060380; Fri, 24 Apr 2020 07:04:20 -0700 (PDT) Received: from rsa-laptop.internal.lan ([217.25.229.52]) by smtp.gmail.com with ESMTPSA id v18sm4937790lfd.0.2020.04.24.07.04.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 07:04:19 -0700 (PDT) From: Sergey Ryazanov To: OpenWrt Development List Date: Fri, 24 Apr 2020 17:04:14 +0300 Message-Id: <20200424140414.3540-1-ryazanov.s.a@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200424_070424_481083_43C5D673 X-CRM114-Status: GOOD ( 11.18 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.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 [2a00:1450:4864:20:0:0:0:132 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [ryazanov.s.a[at]gmail.com] -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 -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 Subject: [OpenWrt-Devel] [PATCH] base-files: prevent issues w/ overlay on powerloss after sysupgrade X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 Due to filesystem write caching the old configuration data could stay out of flash for a long time during a first boot after the sysupgrade. Power loss during this period could damage the overlay data and even make device inaccessable via the network. Fix this by syncing data to a flash as soon as the previous configuration will be unpacked after the sysupgrade. Also sync the FS state after the sysupgrade.tgz archive removing to prevent duplicative extraction of a previous configuration. Tested with AMD Geode based board. Signed-off-by: Sergey Ryazanov --- package/base-files/files/etc/init.d/done | 2 +- package/base-files/files/lib/preinit/80_mount_root | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done index 374353a23c..32d6118df7 100755 --- a/package/base-files/files/etc/init.d/done +++ b/package/base-files/files/etc/init.d/done @@ -4,7 +4,7 @@ START=95 boot() { mount_root done - rm -f /sysupgrade.tgz + rm -f /sysupgrade.tgz && sync # process user commands [ -f /etc/rc.local ] && { diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root index f3fe788e19..265a3f18df 100644 --- a/package/base-files/files/lib/preinit/80_mount_root +++ b/package/base-files/files/lib/preinit/80_mount_root @@ -9,6 +9,8 @@ do_mount_root() { echo "- config restore -" cd / tar xzf /sysupgrade.tgz + # Prevent configuration corruption on a power loss + sync } }