From patchwork Wed Nov 28 19:44:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1004810 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=none (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n9sc2D3w"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 434rhj6KJ6z9s3l for ; Thu, 29 Nov 2018 06:44:49 +1100 (AEDT) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date: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=L4CxMqt30KXy2WmAm4GQNbqgvYzEIPFAegr89lO7QZk=; b=n9sc2D3wQKaXcd Tq9IyV9vTs3g8Iz7YrR238fl9py+ybRNFpdli/oE+jkWa0IGqSAKU8ftrnVzZmm9utxvzLnWhabH+ 2F2+KkmBkEiCnjaHxvTAH5uFr/ZCLx6hl1TdaI7yamdDh6N4MgL+cguCIMrRvrSUQWe8IuhgdsWi+ cGlQEJ1fMGDNxQ0owQquSK+PlUG041ub4Hu5WGDK+yvt6d0xgzxBBf1+BL9zUm0vM2mMkiPb9KJjf SQPunIlR4OvPhwpY5pOZ0SsRsPgguq0TQ8dn0XdnoeLpDh4I33xracV1DC5Jck56tPOVLPnAE6HVK Y6XxhL5qrsvzNE283xkg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gS5lK-0005pC-U9; Wed, 28 Nov 2018 19:44:42 +0000 Received: from mx-out.tlen.pl ([193.222.135.158]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gS5lF-0005dn-2e for openwrt-devel@lists.openwrt.org; Wed, 28 Nov 2018 19:44:40 +0000 Received: (wp-smtpd smtp.tlen.pl 36569 invoked from network); 28 Nov 2018 20:44:21 +0100 Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 28 Nov 2018 20:44:21 +0100 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Wed, 28 Nov 2018 20:44:21 +0100 Message-Id: <20181128194421.1712-1-tomek_n@o2.pl> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-WP-MailID: 335017e76ebe5fff849d45826486fba4 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 000000A [scOU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181128_114437_289817_FD974FC8 X-CRM114-Status: UNSURE ( 6.85 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [193.222.135.158 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH] x86: make sysupgrade.tgz reachable again X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomasz Maciej Nowak Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Moving binding mount before check for saved sysupgrade configuration made it unreachable. Fix it by moving binding mount after the check. Fixes: f78b2616 (x86: mount writable bootfs) Reported-by: Lucian Cristian Signed-off-by: Tomasz Maciej Nowak --- target/linux/x86/base-files/lib/preinit/79_move_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config index debce43557..aff720a52c 100644 --- a/target/linux/x86/base-files/lib/preinit/79_move_config +++ b/target/linux/x86/base-files/lib/preinit/79_move_config @@ -9,10 +9,10 @@ move_config() { if export_bootdevice && export_partdevice partdev 1; then mkdir -p /boot mount -t ext4 -o rw,noatime "/dev/$partdev" /boot - mount --bind /boot/boot /boot if [ -f /boot/sysupgrade.tgz ]; then mv -f /boot/sysupgrade.tgz / fi + mount --bind /boot/boot /boot fi }