From patchwork Wed Dec 27 11:01:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 853127 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QdcgnOA4"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b="pYQZvRBL"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3z691j6qRZz9s7s for ; Wed, 27 Dec 2017 22:03:05 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=oe1K9ZxfoGD61/CIwUo5bpt3lkiWqg5qDOHrlgb+wEc=; b=QdcgnOA4+9G0jL v4rBTkPudz9/xNHmxFYlhIeJIqhZOOWxJUXVKhDxocA6u+3wY8+bB+p8w3mRZnykvVrKrrb4DMODd KMrHlM6LTtgNgUf7/Mhj9mOkcTiujnrJ0X/3fQ+yY7Eh3DKNPb8UUKMZjb5jNpmTzrKTj2jQo3EuT ASE/1eDJlwLA1uBwByXLeji3XnnZ/ebadfOz92EkBD7pPCNtlqS1KAvvdKIlhK6L36duQsucc+Qwi tXjvDCKdjfnXMxPnI8jwih7USpXboWP9HFRxTXNTBkpjmXr7k0swSgRq8wx4JoguIEBvg/FfumeWh yQxpp7QpPfaZ85zXxmlQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eU9UE-0003aw-Hz; Wed, 27 Dec 2017 11:03:02 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eU9U8-0003VE-Qa for lede-dev@lists.infradead.org; Wed, 27 Dec 2017 11:02:59 +0000 Received: by mail-wm0-x244.google.com with SMTP id r78so39003967wme.5 for ; Wed, 27 Dec 2017 03:02:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=Yv0fbva+/9+dHws7EO+/I2vT9147HMswqvemj0iHMyc=; b=pYQZvRBLV3NCoKrGe12lf8+1ZdaZ6i0iaHHmbn7gwlvrpOo1q3aFg4ctQ2z7g2l83R 2Atb3m6SaJDyqdc9uNCarNNWTeziW1uzjXhfVgFb3ts67nm00YHylLVrXZapuctG2wLm 3RGBfo0u9mMt+Ia+pJS1C2d48Yq5l7T8wx+eG/fEwcGKTpvS/v5xNwPtL0eS0na2PNGR AmDrtSMvsbxYCARUfROvittpsfC6bnXp+huV9EJSOkkHK50G36VWPvznApHKw091fU63 XcFj0Mdg15TI13QrTPKvSW5yDVVCf7usVopXWDx01+CvmC+3M6/FBaBTgkFRi+ERO+11 einA== 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; bh=Yv0fbva+/9+dHws7EO+/I2vT9147HMswqvemj0iHMyc=; b=LEaNkNJgLQSmGm42yN2FK8xN70OFmdkXGIESIPPyug1YYgD/2prycdiL+VPrStpfcI SvCjeoB9DDB93SpvI0DkRyFVMTKVBVnkEMdhudhALoRpFNwfwxnLlb6UJoz8ACPG6+/k 1trRshkk82oDTBJ26MwQuZX5/v5Zn4Q+4ijM4UrSC3e4dMdqb7EEw6l1QoIJiYacYwdu r7QlhGZV58/wg/tPGRgSYXp9EllQA0T+l5rx5NuV/kyPTwmqpI1Qozm0VnSFzCyqv7b+ EdLuDyLQ5beD2ggz/PHtdy3Fo1sCuZkK67GOW0X4tRgi210o29+n77447Kst+OEWmhmw UfZA== X-Gm-Message-State: AKGB3mLh8cuGie87Rk0sL1IqApc6Oql4bFqVqXoC6BMecT8On3hTu9Eh rYry146m7pg3QRzvKeq7v+itGBBV X-Google-Smtp-Source: ACJfBovMHgzRgJoq6aNTAHnhE7xp79gCqPK9/0R+OlCtyQFUDIDLbPXm+XogQC7KzToVsF30ifIhiQ== X-Received: by 10.28.46.136 with SMTP id u130mr25499373wmu.127.1514372564508; Wed, 27 Dec 2017 03:02:44 -0800 (PST) Received: from desktop.wvd.kresin.me (p2003008C2F241F10F1354A3912861EA1.dip0.t-ipconnect.de. [2003:8c:2f24:1f10:f135:4a39:1286:1ea1]) by smtp.gmail.com with ESMTPSA id g84sm9289300wmf.26.2017.12.27.03.02.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Dec 2017 03:02:44 -0800 (PST) From: Mathias Kresin To: lede-dev@lists.infradead.org Date: Wed, 27 Dec 2017 12:01:49 +0100 Message-Id: <1514372509-12502-1-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171227_030257_238663_FAC4FDA9 X-CRM114-Status: UNSURE ( 6.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:244 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] treewide: remove obsolete sysupgrade watchdog kill X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The watchdog kill command was meant for busybox watchdog. Busybox watchdog was replaced by the procd watchdog mid 2013 with commit df7ce9301a25 ("busybox: disable the watchdog utility by default"), which makes the kill command obsolete since quite some time. Signed-off-by: Mathias Kresin --- target/linux/adm5120/base-files/lib/upgrade/platform.sh | 9 --------- target/linux/apm821xx/base-files/lib/upgrade/platform.sh | 10 ---------- target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 10 ---------- target/linux/au1000/base-files/lib/upgrade/platform.sh | 10 ---------- target/linux/cns3xxx/base-files/lib/upgrade/platform.sh | 12 ------------ target/linux/ixp4xx/base-files/lib/upgrade/platform.sh | 12 ------------ target/linux/lantiq/base-files/lib/upgrade/platform.sh | 9 --------- target/linux/mpc85xx/base-files/lib/upgrade/platform.sh | 10 ---------- target/linux/mvebu/base-files/lib/upgrade/platform.sh | 10 ---------- target/linux/oxnas/base-files/lib/upgrade/platform.sh | 10 ---------- target/linux/ramips/base-files/lib/upgrade/platform.sh | 9 --------- 11 files changed, 111 deletions(-) diff --git a/target/linux/adm5120/base-files/lib/upgrade/platform.sh b/target/linux/adm5120/base-files/lib/upgrade/platform.sh index fab2b3d..b874a5e 100644 --- a/target/linux/adm5120/base-files/lib/upgrade/platform.sh +++ b/target/linux/adm5120/base-files/lib/upgrade/platform.sh @@ -33,12 +33,3 @@ platform_do_upgrade() { PART_NAME="$sys_mtd_part" default_do_upgrade "$ARGV" } - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh index 5d2eee4..a45af7d 100755 --- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -61,13 +61,3 @@ platform_copy_config() { ;; esac } - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index ecf6820..35c6886 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -834,13 +834,3 @@ platform_do_upgrade() { ;; esac } - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/au1000/base-files/lib/upgrade/platform.sh b/target/linux/au1000/base-files/lib/upgrade/platform.sh index 1a9d151..7beb4a0 100644 --- a/target/linux/au1000/base-files/lib/upgrade/platform.sh +++ b/target/linux/au1000/base-files/lib/upgrade/platform.sh @@ -24,13 +24,3 @@ platform_do_upgrade() { get_image "$1" | tar -Oxvf - $KERNEL_IMG | mtd write - "kernel" get_image "$1" | tar -Oxvf - $ROOTFS_IMG | mtd $conf write - "rootfs" } - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh index 4efa47d..aa98b47 100644 --- a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh +++ b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh @@ -17,15 +17,3 @@ platform_check_image() { platform_do_upgrade() { default_do_upgrade "$ARGV" } - -disable_watchdog() { - v "killing watchdog" - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -# CONFIG_WATCHDOG_NOWAYOUT=y - can't kill watchdog unless kernel cmdline has a mpcore_wdt.nowayout=0 -#append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh index e1e43cf..92eeaff 100644 --- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh @@ -135,15 +135,3 @@ platform_do_upgrade() { ;; esac } - -disable_watchdog() { - v "killing watchdog" - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -# CONFIG_WATCHDOG_NOWAYOUT=y - can't kill watchdog unless kernel cmdline has a mpcore_wdt.nowayout=0 -#append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/base-files/lib/upgrade/platform.sh index 77b3868..9755dc4 100755 --- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh +++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh @@ -16,12 +16,3 @@ platform_pre_upgrade() { } # use default for platform_do_upgrade() - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh index 67e8324..1108b3f 100755 --- a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh @@ -10,13 +10,3 @@ platform_check_image() { } # use default for platform_do_upgrade() - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index 8241d1e..fdc94d3 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -34,13 +34,3 @@ platform_copy_config() { ;; esac } - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/oxnas/base-files/lib/upgrade/platform.sh b/target/linux/oxnas/base-files/lib/upgrade/platform.sh index 6652e14..8c2e347 100644 --- a/target/linux/oxnas/base-files/lib/upgrade/platform.sh +++ b/target/linux/oxnas/base-files/lib/upgrade/platform.sh @@ -16,13 +16,3 @@ platform_check_image() { platform_pre_upgrade() { nand_do_upgrade $1 } - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 8160f5d..7003880 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -321,17 +321,8 @@ platform_do_upgrade() { esac } -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - blink_led() { . /etc/diag.sh; set_state upgrade } -append sysupgrade_pre_upgrade disable_watchdog append sysupgrade_pre_upgrade blink_led