From patchwork Fri Jan 3 17:59:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11317257 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E085109A for ; Fri, 3 Jan 2020 17:59:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C9A222522 for ; Fri, 3 Jan 2020 17:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578074398; bh=dMqASpC659LENtHa95N1QTvsssdbeiVwXeWGI7uR54o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GGE99qWu49V9xksNXChNahQQx7gO7ybn8E2GH4ok9kY4AEnfWJ6mCDmaQhJ1TtCZt gX/KO0DAJPhoM5rGB6+6wWNNRs2dmjQ/DHGeGPhxUeWBMx9rRNzyl+UTpuib237QXo BpJHmTPG/SXuiX+U0XXvI6Ra5D8ZXqbXTrCJI8PA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728346AbgACR7y (ORCPT ); Fri, 3 Jan 2020 12:59:54 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:64930 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728344AbgACR7y (ORCPT ); Fri, 3 Jan 2020 12:59:54 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 003HxSJD022724; Sat, 4 Jan 2020 02:59:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 003HxSJD022724 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1578074376; bh=/afvTso/ONcbcPbguDu7doM3beXBGjZKCYuIlhp0xDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Br4rfbRu5i0gbvU0nzBOzM4der3Qvjcbms4s5AqAy0sws3+s5DJYzqQN4ga7SUmBh W4oBcIiUZi1szC+IrjLCglukha9lum7QeLjDHrZhKngvJKVi7fAIyWcCMYDwneWwMH VGjxzAv7lgQ3osY8CHPpxollowRMWpACJjwap19wA639Nfs2rPJ0aOF8agtLla5aOZ W5rkf8MpvpJw7f4LaSWwl8j76rxRHuzlLamxLvMNWdpkvuaRRMLBZbBvnDDkdiJwgt eSUc04v4HQ0mw7tMg6y//l8JYnkk2PYS5lve2V9Y3hxiutclNGixOTCxxQxqWTbl8o qozQrpG1E9Nag== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 12/12] gen_initramfs.sh: remove intermediate cpio_list on errors Date: Sat, 4 Jan 2020 02:59:15 +0900 Message-Id: <20200103175915.26663-13-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200103175915.26663-1-masahiroy@kernel.org> References: <20200103175915.26663-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This script sets the -e option, so it exits on any error, in which case it exits without cleaning up the intermediate cpio_list. Make sure to delete it on exit. Signed-off-by: Masahiro Yamada --- usr/gen_initramfs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr/gen_initramfs.sh b/usr/gen_initramfs.sh index 4e6715f8ff7f..8ae831657e5d 100755 --- a/usr/gen_initramfs.sh +++ b/usr/gen_initramfs.sh @@ -193,6 +193,8 @@ dep_list= cpio_list=$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX) output="/dev/stdout" +trap "rm -f $cpio_list" EXIT + while [ $# -gt 0 ]; do arg="$1" shift @@ -243,4 +245,3 @@ if test -n "$KBUILD_BUILD_TIMESTAMP"; then fi fi usr/gen_init_cpio $timestamp $cpio_list > $output -rm $cpio_list