From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:ac2:560e:: with SMTP id v14mr12430243lfd.158.1627905247688; Mon, 02 Aug 2021 04:54:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:88c:: with SMTP id d12ls1315204ljq.9.gmail; Mon, 02 Aug 2021 04:54:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx59E7JI7l+VUhL7AX9eh0q04P6H4/sf4YpigkKt/tfHTMn+45KelCho+npePc6z+jt4a1p X-Received: by 2002:a2e:a787:: with SMTP id c7mr11142046ljf.112.1627905246683; Mon, 02 Aug 2021 04:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627905246; cv=none; d=google.com; s=arc-20160816; b=Blr6Xjyy6ID9f2WmpDee/XJ+/YbddkMOtjClZkKuA8nO8t/oor1BB7rRMX9ubOytuK mpW0QeodoOVIG+a5zRHXorc/ZsqqHxg8Ysr8bxoT65QLMZ5UIpfEr+q1RXnfMCtMpeIB wXrUbo8ile+wiT928suycGnUFE2GT0pzVKxxUb/vw7ekPBrdSSgqlCAb0hgWNvJuTaHi t1XS86s4tQYbLGOxT2Fm4lYhcThVwU+uOdBREdRS7LD39xSoQoFGpgk3g9imaopGnivd gecjkhW6LICSBDwHpo01/HEWpV54nNSR5Qef/pCafw5KnoJj/5nEdF6+rXW4kLJTOE7K +h3A== 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=su1lyw733lwups1J/r2IOlnmmSZI9F+61fQgRblGIBdUxNAIeDsLarLqER804+Pbs0 /E6aG7zyHR2/Fb+wK8LQPDc6Abtln6IybK6UG1Sh9E1Np1xjg/9Go0mQimuF0nN053J1 HDCUQeq9SVhJcmd0o9xGI2kG+d00q6fKLPdzYHSmnSYTMXfIw4MYlZUiTkNjaVnymnv5 BrrUtflxo4zGaUmc8qK/rZMDnZTiNPZ+bIYukXtWfuOqU262mTZc8X0NSDvtnEA1GpMH nu2bmjjnrh8rM66tJ+7mrCWI07clMR8PrFVnrUYbWr6q8eXBxUJ+V/f9e529e+VHvfu3 MlOA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id v15si494442lfa.6.2021.08.02.04.54.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 04:54:06 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 172Bs5CL011695 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 2 Aug 2021 13:54:06 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 172Bs5fI028005; Mon, 2 Aug 2021 13:54:05 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v3 1/4] classes: make sure container extension can run multiple times Date: Mon, 2 Aug 2021 13:54:01 +0200 Message-Id: <20210802115404.22707-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802115404.22707-1-henning.schild@siemens.com> References: <20210802115404.22707-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: athoW1DpXwZD 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