From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7088339307047419904 X-Received: by 2002:a50:9b5d:0:b0:41d:9252:87f8 with SMTP id a29-20020a509b5d000000b0041d925287f8mr23856970edj.181.1650459648091; Wed, 20 Apr 2022 06:00:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:9702:b0:6e8:c0b2:edfc with SMTP id jg2-20020a170907970200b006e8c0b2edfcls1117403ejc.11.gmail; Wed, 20 Apr 2022 06:00:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyFhMfrwl0OL5ze10MTQE+b+pQ+V0Uq4VqkHVLHFwhF+xNfJjzIPSNr4vRoXt2ryBGjPPE X-Received: by 2002:a17:907:6e04:b0:6e0:736b:d786 with SMTP id sd4-20020a1709076e0400b006e0736bd786mr17989725ejc.667.1650459647048; Wed, 20 Apr 2022 06:00:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650459647; cv=none; d=google.com; s=arc-20160816; b=cGPfVxebOA6RBYHedvFM1HPMDDZb6xzzqL9bEtbS0NirDtNnEhuoMIX0j3JsEKPLqe nhMVltQbIDrajbHBG7KU5wjTrHGqKkQBPwcWnVRPvGpbOr2kX6gQE3zjso7eyIt1krf2 fa4X2uz9xoW9mxxvZyxrYDnTloUdnaeY/W0peHC/t1RXDEG4czST2/g3B3wIarvBICfK 5MKVazPgGI3bbyfyXLYfOJHG4gC0Nm7TmgmdAlHwnA48zSQRit3I+kJRyKMvvGzBbizO P0co/ejFkvVhyVeMF+hnpVscG0lJb0jiaLkhKOKlC/q4RdCkDTBEQNZFtTsGgqvRG+uk grlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=RzuUV6MvUH/eG2nOeTm5W9WigJBOq3zlL+B1U4uZGUs=; b=jpm22PixMjQ3DzodMm7rh22IJZma+GQtrLPAedYqdqJob/XzvUkLhZsQbtk6/0h6NG sd3LQQR+LKJ/ug5DNY70FzoPRKZ4LqFaCp0AH/8wS4W4hSgE9TjG0bsW7THKtoId3VaU 1AZjxBsWA0wAP2E1q1Fv39jPh4u4RU/ZgIZRhcycp0g5bYgPb+B8B9CfutuFT6ltZuQ6 EuNIG42GO+oDRTpO4/gKESQv6FG0eGkT2yMJySQlzgeq62/8Ebj9E5xYCsxijf+2onnP y/PKcxOXI9FMqwopfh7RFIMnOE69OdoPYFfUcIeKRfWcouMKM+ZH76aPcprPhKH4ac/E AXrA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=T7BokHUy; spf=pass (google.com: domain of fm-51332-202204201300461b8327f96d8e82a592-8ixbfq@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-202204201300461b8327f96d8e82a592-8IxBfq@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id h23-20020a170906829700b006e89250c574si87074ejx.2.2022.04.20.06.00.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Apr 2022 06:00:46 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-202204201300461b8327f96d8e82a592-8ixbfq@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=T7BokHUy; spf=pass (google.com: domain of fm-51332-202204201300461b8327f96d8e82a592-8ixbfq@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-202204201300461b8327f96d8e82a592-8IxBfq@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202204201300461b8327f96d8e82a592 for ; Wed, 20 Apr 2022 15:00:46 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=RzuUV6MvUH/eG2nOeTm5W9WigJBOq3zlL+B1U4uZGUs=; b=T7BokHUy4galX58vitgPsHdFwmydsPEjZlmc/UDWkBie1sbD4N6ug8BOGNnyWwuWPC7CaZ 0XeIRfrbhcqZ/H36J/MesIThtqSEcyjfOVrCXEu8D7IVg52ZxHDIY1+zLPrDI0CPIA/CZjxr TDGHhXNS7wnlg2fQ6DiVaifM9RYiA=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, isar-users@googlegroups.com Subject: [PATCH v3] classes/image-postproc-extension: Remove /etc/machine-id Date: Wed, 20 Apr 2022 15:00:44 +0200 Message-Id: <20220420130044.668017-1-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220420072836.324028-1-Quirin.Gylstorff@siemens.com> References: <20220420072836.324028-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: apyBSeCpRz05 From: Quirin Gylstorff In a read-only system the machine id should be deleted or set to `unitialized\n`[1]. Systemd will generate a new machine-id during the first boot. In the case of a read-only root file system Systemd generates a mount point with the machine id. If an overlay for /etc is used this creates a mount conflict. To avoid the conflict between the overlay filesystem and systemd /etc/machine-id mount point deleted the file /etc/machine-id. This partly reverts 98d6a72d3064. The man page[2] was updated for Debian Bullseye to allow a missing machine id. For Debian Bullseye it reads: ``` For operating system images which are created once and used on multiple machines, for example for containers or in the cloud, /etc/machine-id should be either missing or an empty file in the generic file system image ``` [1]: https://systemd.io/BUILDING_IMAGES/ [2]: https://manpages.debian.org/bullseye/systemd/machine-id.5.en.html Signed-off-by: Quirin Gylstorff --- Changes V2: - add information about revert of 98d6a72d3064 Changes V3: - Fix From: meta/classes/image-postproc-extension.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass index ca520273..0c412c0d 100644 --- a/meta/classes/image-postproc-extension.bbclass +++ b/meta/classes/image-postproc-extension.bbclass @@ -57,7 +57,7 @@ ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id" image_postprocess_machine_id() { # systemd(1) takes care of recreating the machine-id on first boot sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id' - sudo install -m 644 '/dev/null' '${IMAGE_ROOTFS}/etc/machine-id' + sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id' } ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_sshd_key_regen" -- 2.35.1