From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:ac2:5394:: with SMTP id g20mr4047187lfh.603.1628179045177; Thu, 05 Aug 2021 08:57:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls4680796lfi.2.gmail; Thu, 05 Aug 2021 08:57:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSoJ3t0xDUSLKQ5BHwm5TTQbUM/TyTuAHeXNRuvxP2kDSOHGTlNCI3ZVR3tjImQnmNuGTd X-Received: by 2002:a05:6512:3b0:: with SMTP id v16mr4251335lfp.224.1628179044084; Thu, 05 Aug 2021 08:57:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628179044; cv=none; d=google.com; s=arc-20160816; b=0b5l1/tUUOjnjJunDE7uOpU6K0AXssJn2295p18n0qOuKxrJBRpMYuHM4G/5w7Y2Vc 1nwQz8TnS6D57FvujmJ/uFz8YKWwd4A32mgexhG1cGJDyxe0PTP3dlSQFm+ZTmQyed1b Cgc7CeClbdRRO28sZCp8liSVjTWsuv1OsFRST07+E+kRpwuHRyPVKJe30RDtYHw6A1oh 1A8W9xuBeVsR3w3DJRWBRjQJC+F9bbxbUQ8UJwC+VMTmWz8jZC/ybgVXHMdng8zkVZq1 EkHX4JbX7Hh0pwXk41TqFtie6lwzVYLwq/9Ub5DBzZfk4+BFjcsB8ncXxx7ZHaAiiWpF /p+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=uU6qVCY1GUJohBTxY7mKLoLK2DMKQcgBBOkkj1Q22z0=; b=Ak6g+Qa9jN+fe+U3MoXamgtYCeXMIKUv6QnAEfUL91kDRM2VhjtE6apoe4otWhzbGA 20VHtL9PHwzfQc1JLBsrleWQlNezGMoobCZVtGnovQx6URCdPcISbq7Whdx6x/XGYhMM le15B1qH4aTcquWTIrS9VbAE/CHtmIjs86Iq+KmBW1qqFWI4BYYOKZ5m974KHfuhrotU W4oKYI2p6SqA5Pd19Do+aBYpQrneVqUnHop1S30G9qqaS5WSx6ULwqVNmgZNgc4vkZIc lFgCBJ6iTkmZwcE+QrAv2QWQzIUlOhsaUrjBdMPI5+e6QQrrngTXz9mhz0zaaOd1G8Tx vHqg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id d6si296850lfk.4.2021.08.05.08.57.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Aug 2021 08:57:23 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 175FvN2d010755 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 5 Aug 2021 17:57:23 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 175FvMeB025489; Thu, 5 Aug 2021 17:57:23 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v4 1/5] classes: make sure container extension can run multiple times Date: Thu, 5 Aug 2021 17:57:17 +0200 Message-Id: <20210805155721.11872-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210805155721.11872-1-henning.schild@siemens.com> References: <20210805155721.11872-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ddDciP17QuS+ If the container extension fails somewhere in the middle, it could leave things behind resulting in issues when trying to run only that one task again. So make sure to remove stuff as root and remove another possibly existing directory. Signed-off-by: Henning Schild --- meta/classes/image-container-extension.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index e26604a04f06..6537fc693265 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -18,7 +18,7 @@ containerize_rootfs() { # prepare OCI container image skeleton bbdebug 1 "prepare OCI container image skeleton" - rm -rf "${oci_img_dir}" + sudo rm -rf "${oci_img_dir}" "${oci_img_dir}_unpacked" sudo umoci init --layout "${oci_img_dir}" sudo umoci new --image "${oci_img_dir}:${empty_tag}" sudo umoci config --image "${oci_img_dir}:${empty_tag}" \ -- 2.31.1