From patchwork Fri Jan 6 13:11:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roberto.foglietta@linuxteam.org X-Patchwork-Id: 2415 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 06 Jan 2023 14:11:40 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f191.google.com (mail-il1-f191.google.com [209.85.166.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 306DBZrg012573 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 6 Jan 2023 14:11:36 +0100 Received: by mail-il1-f191.google.com with SMTP id x8-20020a056e02194800b0030c1ca49d7dsf1081597ilu.8; Fri, 06 Jan 2023 05:11:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673010690; cv=pass; d=google.com; s=arc-20160816; b=IdvarXsaUjN0sXtju3+QtoPl9oJfaSleIzAYkVbAnyshLYqurwwycku1RrcpGbV2vy EgRj0xRPiz8oqQ3cl/+Pacw3FSiW6MnnMsmlotY2hjfy0j0KzkxIVyFI7iXaZF5a7MyL YGhN6TiNsn5bhxsz2h2NQVCoozF9Z/gih0wq+nhQ3ME28dO2NGPC4vFwiqZGxZ0cpBAQ 509Ag8XMbmV+E/aSBncRM9zvaIJKIqrFsDrFQTOp2UuHdOY4t4lXcvD03h3dzbsN8vq/ aLZk/2pHF8Wr64DIVA272ncABqC5rpAhxUfZSwQvAA0+1WBy60VgjQZYfHV5Zd9y+QZ1 90PQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=uP4F6VHrqkLojPZ1rGPBUCpF5VBJ0qelaITgWboTm08=; b=X5COD0ybxmnbFTrtNeznfcOZOay3W7Bsk3KwklotGA8Xxt6l0ru8NB+NaDzG8+SAx7 20a60KOpSHf9Bc2d+/dCwzDmV5OzsP0XdjF3tDJtVis+x9lMgKY1CO/W11BkRM0WJejf IWCzBIBvVm2JAtMxtWWnLNjr2iDZG71I1VWiJTLV6xSeMFQ/eJJj73NbSQlGkEJaEoua gPDw3sG47gM8PZl0734KOsh/7BcR5KTUCmC86fgpQ03+TcvCfxDFbIaC6TwSQ5hHFlLe MrLjJwcL3RArh6yq5cYG34bp2f1QBlPwG13Sl75dyutQgkFT18rwVwgjickiyOSDtwam pVqA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.167 as permitted sender) smtp.mailfrom=roberto.foglietta@linuxteam.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=uP4F6VHrqkLojPZ1rGPBUCpF5VBJ0qelaITgWboTm08=; b=M2mZo/rWEbVwV8Xajzy9E0zTcgdb4HtDMjMxILZaEvNusnC+Yw6ea35d1Mui3fpy4i OYEfhIg5rwpkAhrz/JhdnY4SSKlyqP+DYxGbvXIBh7ECyqpjCp9pNHq8xqA67UhtPd4C ymSHyhON43j+l6nWGhBSqWceV8R2A9myJOXs1qbRZfEVSeN552KMSxRuNUkeri7WHlXr 48YbRSrV9VjonthHxlQ+0yMcHVYhxH5R/tYjBIprv9uy4iXVIS1y90ofVdAM3BPi03WY 7W4BYyILJ8lJNIPit9jRJDx/DqT7TnYdyz+1TGAeiO1mgqzX85r4PsB4RXSGgJfL9ok4 8eBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=uP4F6VHrqkLojPZ1rGPBUCpF5VBJ0qelaITgWboTm08=; b=RAfHVsrNruuRAvyeHFTUOk2o8XmvwIwhH30IDs60XsqQnEF03caRVYKURHdasXrxOC ay+6TRr+DHfnIEINl4odwA/WRDkhiLELqcve2NDZ7JebR8BH2ByCdEmbC9Lq8B5I6nNt tL9SRJ3Qto3kpz/dZgtkZqY56ZFX29xclVNE4VIZoJTCHQL7+XfGj3BrH+Q1fWnfZhBK Z7v8VebhAyacQt9H9RpGfrLoFS8bPZKqLhGOdmceMKsGOVG82zNm1ow2uZqU01JY/JSy fUXiRHkqTkmJ2f/c6wTsQKNvUNgMl5rlVUQwG5ZgbfsrLqCneMpE2IMxb7dW4rnFbU7r /pMg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kqn2qkA5kRGxW5IULcz1TAeuhL/xSOFht8LqpcZgExutxwC3Cyy SzD8tGpqagshBgErP22aLK8= X-Google-Smtp-Source: AMrXdXvTbuw8WWwrMH0ghPOOmm4hGLeE6/CILcdpOcwqg7o6ceDUT+M/sCYld5lxzVKKdo8jDYWJxQ== X-Received: by 2002:a5d:8181:0:b0:6e2:f1a9:ec7 with SMTP id u1-20020a5d8181000000b006e2f1a90ec7mr3881830ion.21.1673010689998; Fri, 06 Jan 2023 05:11:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:f87:b0:30b:f63e:3073 with SMTP id v7-20020a056e020f8700b0030bf63e3073ls6967914ilo.5.-pod-prod-gmail; Fri, 06 Jan 2023 05:11:29 -0800 (PST) X-Received: by 2002:a92:b708:0:b0:303:9e8d:8455 with SMTP id k8-20020a92b708000000b003039e8d8455mr35776251ili.7.1673010689597; Fri, 06 Jan 2023 05:11:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673010689; cv=none; d=google.com; s=arc-20160816; b=KeEIG806lCaoESFjESwteOJLGWcZmTzzSfIjP6xAU7F2ooW07Yd7D9ikFp+s5ARngV ZFQRCb/2NqqmZvJIolb7C+lFPiFU/HBbekOTV2kTasT0SptHcvBUfqcOAlC18M33W+wD qsnjnRszGPFdQhiMRERb76yRZlGeHCdTU2HhTG0RdVbXVlxQtpJ+PPfshVXuxvZZaCcw PoYW6+MXYNdkyQlRz59AWzrSbm393Fj8vfctTSFQPc+apklqJhlm1l3qfn/CPwLeueKq tU6HWqNeisw9QGNjEZZYLJ6D9HPHm1WPeybRm0MB6zZZ0YILOJ7ZOW4SsSLOg2aWP0TZ 3MJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=lBcUtmPbq58NGNRAQaP5hJCixzXIl4n2hVun9r84xk0=; b=mLbFNedQqVdCYGanud0c8xyUp5nlfJixEVVxEPJ2J2dHH4NJ1YC0yGVWXr4Jpje2x9 bqVavtQ5Scv65w4FvefU6vX6jZ48N/hwVz+wcV/piIKucBM4tb3Z3sLdbsmbIKXcCogN zZQkUIOpfzUQmCzX8sk2nq8sFta/8N/0wj9Zj5rA3vYmm/NgcLMsoTswq/lgRY1z/TJG XXPJNMjW5P3YNVCqx4cgfO9Qr5cA2bZGloXDOBcxaTHbxGBWVuUSdWiRE9nFSISAichA 9zUSAsndgmoa9wsmZ/bzICgS19cPT7DYIxovW2i0LfjHAPmz2frJA+MQdXm5+qmGtNtF jgog== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.167 as permitted sender) smtp.mailfrom=roberto.foglietta@linuxteam.org Received: from relay06.th.seeweb.it (relay06.th.seeweb.it. [5.144.164.167]) by gmr-mx.google.com with ESMTPS id h2-20020a92d082000000b0030bd6caf60asi62747ilh.5.2023.01.06.05.11.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 05:11:29 -0800 (PST) Received-SPF: pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.167 as permitted sender) client-ip=5.144.164.167; Received: from localhost.localdomain (unknown [IPv6:2a02:8071:3187:7b80:1035:7147:9529:4b60]) by m-r2.th.seeweb.it (Postfix) with ESMTPA id 30C323EEE4; Fri, 6 Jan 2023 14:11:28 +0100 (CET) From: roberto.foglietta@linuxteam.org To: isar-users@googlegroups.com Cc: roberto.foglietta@gmail.com Subject: [PATCH v3] image: make sure do_rootfs_finalize can run multiple times, v3 Date: Fri, 6 Jan 2023 14:11:25 +0100 Message-Id: <20230106131125.3266701-1-roberto.foglietta@linuxteam.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Original-Sender: roberto.foglietta@linuxteam.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of roberto.foglietta@linuxteam.org designates 5.144.164.167 as permitted sender) smtp.mailfrom=roberto.foglietta@linuxteam.org Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: "Roberto A. Foglietta" image: make sure do_rootfs_finalize can run multiple times, v3 v2: essential code, only v3: code above the fix, rationalisation Signed-off-by: Roberto A. Foglietta --- meta/classes/image.bbclass | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 629a0c1..7a5ced5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -419,15 +419,13 @@ do_rootfs_finalize() { mountpoint -q '${ROOTFSDIR}/sys' && \ umount -l ${ROOTFSDIR}/sys - rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list" - rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt" - rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" - rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar" - - mv "${ROOTFSDIR}/etc/apt/sources-list" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - - rm -f "${ROOTFSDIR}/etc/apt/sources-list" + aptdir="${ROOTFSDIR}/etc/apt" + rm -f "${aptdir}/apt.conf.d/50isar" + rm -f "${aptdir}/preferences.d/isar-apt" + rm -f "${aptdir}/sources.list.d/isar-apt.list" + rm -f "${aptdir}/sources.list.d/base-apt.list" + mv -f "${aptdir}/sources-list" \ + "${aptdir}/sources.list.d/bootstrap.list" 2>/dev/null || : EOSUDO } addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess