From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7122950100315275264 X-Received: by 2002:a05:651c:1501:b0:25d:a415:8ffd with SMTP id e1-20020a05651c150100b0025da4158ffdmr153041ljf.310.1658441058146; Thu, 21 Jul 2022 15:04:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5e35:0:b0:48a:751d:6cfc with SMTP id o21-20020ac25e35000000b0048a751d6cfcls193219lfg.1.-pod-prod-gmail; Thu, 21 Jul 2022 15:04:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sB/V/N9hhSzurymvAeQ14SK4RiSfDoE00HI/ngG4evHGG0L354xdWDAO0a+2LE82Kd23qm X-Received: by 2002:a19:500c:0:b0:489:e7fc:cdfc with SMTP id e12-20020a19500c000000b00489e7fccdfcmr171140lfb.455.1658441057064; Thu, 21 Jul 2022 15:04:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658441057; cv=none; d=google.com; s=arc-20160816; b=PRq9hm3e+ZTEpWolpJAKWtkCVmAZriNBTFmdTn9mtq1lZLxArVANUwLdbZKJFUR3Tn jYrXj3PXoBx5Ci8qQ616C1KZunEF6k5FYgftzZ6t/SHATronmjvnblfqbR07XIKEoy8t 4bBQ21rh3TOfYzv+KEgNggBPzuLH6YWwiYG8jTlWCgUG8R2DsZ8VS0YqQ1uy/ZXEDPEu plwCwoSDZdiybUT5xEQd3uR424j8hrziDd8g8qmyJ7iLEiuz59LUAUL1xPImzxQHQ/iL cPdBeh4pKN9pCLdWpOjtSbI5BqqpXfAedNr/Obg074rlasEdfZ+WUiadhHBoaZbca0N1 4Qnw== 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:cc:to:from:dkim-signature; bh=AQtHxndxGqI7t2Q26ndJC5WoyKnphzqctLjPmKWdXHg=; b=a2uVTo06DXO+ko/nMyc/LaNR1j4VR3mL5DEmoJTOa+wN2jydUXdWLuwTTdPzpzzfjt VypEigpIqL5OPVW6wZmdVOmrGBtqyBxjcDXX9Hps7v40rA8hM1JJg89zTmQOGns2+aU+ vpt+U0xi1TQJ7ypTaPQ+qxUkJbWyICl26FKd42YpaOmd3cVL4THZ4IG1oNH0Fyfr0r2H AaHZDxZ8Dm+34Na0fHAm0WlaFkIK/m8UPZpmg4zSq3R4FGGpFhZKYEOKte7Q+pdXktS5 lxkRry+R72du9E9qB+1iU0BvtjUMM1QVPfCQ1VBECoqzlPsKZt3akf8TmOVPa5VbCkYs fHww== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Bh8ytanj; spf=pass (google.com: domain of fm-72506-20220721220416853dd8d8a5618b9a5a-qsqflc@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20220721220416853dd8d8a5618b9a5a-qSQFlc@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id o22-20020ac25e36000000b0047fae47ce32si42109lfg.9.2022.07.21.15.04.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jul 2022 15:04:17 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220721220416853dd8d8a5618b9a5a-qsqflc@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Bh8ytanj; spf=pass (google.com: domain of fm-72506-20220721220416853dd8d8a5618b9a5a-qsqflc@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20220721220416853dd8d8a5618b9a5a-qSQFlc@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20220721220416853dd8d8a5618b9a5a for ; Fri, 22 Jul 2022 00:04:16 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=AQtHxndxGqI7t2Q26ndJC5WoyKnphzqctLjPmKWdXHg=; b=Bh8ytanjyyLe8xX4/YNwdS/PQaOCpvuWtoOGlq6qe8VR6K+j6Tjx59hvqdc6fKRvJk5qdx ucMc39AM7PwLDENBpS20TpbhSNIKcYZzsyu2MWSzvXAjHA/gqNeJ4OpZVRKCSj7qXP6nA+DY uJdfisdZDKN3iAZW+tY8IocotKG4Q=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: tobias.schmidl@siemens.com, henning.schild@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] fix on-first-boot for systemd >= 247 Date: Fri, 22 Jul 2022 00:04:04 +0200 Message-Id: <20220721220404.1069481-2-felix.moessbauer@siemens.com> In-Reply-To: <20220721220404.1069481-1-felix.moessbauer@siemens.com> References: <20220721220404.1069481-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: HS33Zy3IUb/p This patch fixes the bug that /etc/machine-id is never generated when running from within an initrd with an ro rootfs. In this case, the magic value "uninitialized" has to be used instead of deleting the file. Signed-off-by: Felix Moessbauer --- meta/classes/image-postproc-extension.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass index 0c412c0d..98c697b2 100644 --- a/meta/classes/image-postproc-extension.bbclass +++ b/meta/classes/image-postproc-extension.bbclass @@ -56,8 +56,15 @@ image_postprocess_mark() { ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id" image_postprocess_machine_id() { # systemd(1) takes care of recreating the machine-id on first boot + # for systemd < v247, remove the file, else set to uninitialized + # (required if initramfs with ro root is used) + SYSTEMD_VERSION=$( sudo chroot ${IMAGE_ROOTFS} dpkg-query --showformat='${source:Upstream-Version}' --show systemd ) + if dpkg --compare-versions "$SYSTEMD_VERSION" "lt" "247"; then + sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id' + else + echo "uninitialized" | sudo tee '${IMAGE_ROOTFS}/etc/machine-id' + fi sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id' - sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id' } ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_sshd_key_regen" -- 2.30.2