From patchwork Tue Sep 15 16:28:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 518002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 391A514017E for ; Wed, 16 Sep 2015 02:28:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=MMpu2Ni4; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4F1DB284668; Tue, 15 Sep 2015 18:27:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A4230284435 for ; Tue, 15 Sep 2015 18:27:18 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 15 Sep 2015 18:27:18 +0200 (CEST) Received: by lagj9 with SMTP id j9so112989293lag.2 for ; Tue, 15 Sep 2015 09:28:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=a4Q2p0XBpPwCHusH0LUH+D6pLCU1aev3Q0TWIt2dxGY=; b=MMpu2Ni4W97B9JWoflTNbhkMl1N6B7WFbVVfhBBx1S6qXo/Q5260F/eDSAS9JZMG6A gVbaU6dZYOqNn8RGpp60I2f/UKbk4ESCA0z26/Md9ThiU/uPuHj0RsK9WWtmQ0/3XCn7 4y2HraZAZgvUjhgmmErbmB2IEw0ODzFFAoSm8sjYgiQQmJFTgz7wPk2BTv2w1KidVym+ HYnahU652YUv063ptWOD4uCg4CRcduWlwMM8NK4l4XdagyabeKzx8JFcev2D/7VSMLYD AWeKhsbAP4Bag9d91D0nEW8ONQ59ziKgHdacE7CsUxMInrZF/JmgrtBHHukYd8hAB0zC /cPQ== X-Received: by 10.152.170.225 with SMTP id ap1mr13553331lac.72.1442334507711; Tue, 15 Sep 2015 09:28:27 -0700 (PDT) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id lh1sm3406047lab.24.2015.09.15.09.28.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2015 09:28:26 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: openwrt-devel@lists.openwrt.org, Daniel Golle Date: Tue, 15 Sep 2015 18:28:16 +0200 Message-Id: <1442334497-19000-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH 1/2] oxnas: drop some unused sysupgrade code X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" First of all platform_do_upgrade_phase2 doesn't seem to be defined anywhere. Other than that platform_do_upgrade is not likely to be ever called. There is a call to nand_do_platform_check which triggers nand_upgrade_stage1 call with "exit 0" in it. Signed-off-by: Rafał Miłecki Acked-by: Daniel Golle --- target/linux/oxnas/base-files/lib/upgrade/platform.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/target/linux/oxnas/base-files/lib/upgrade/platform.sh b/target/linux/oxnas/base-files/lib/upgrade/platform.sh index 8591c7d..a43391c 100644 --- a/target/linux/oxnas/base-files/lib/upgrade/platform.sh +++ b/target/linux/oxnas/base-files/lib/upgrade/platform.sh @@ -15,15 +15,6 @@ platform_check_image() { return $? } -platform_do_upgrade() { - if [ $$ -ne 1 ]; then - echo "not PID 1, upgrade aborted." - return 1; - fi - platform_do_upgrade_phase2 "$1" "$CONF_TAR" "$SAVE_CONFIG" -} - - disable_watchdog() { killall watchdog ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {