From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7122950100315275264 X-Received: by 2002:a05:6000:1ac8:b0:220:6af3:935d with SMTP id i8-20020a0560001ac800b002206af3935dmr3730587wry.549.1659436786257; Tue, 02 Aug 2022 03:39:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:668c:0:b0:21f:15aa:1c69 with SMTP id l12-20020a5d668c000000b0021f15aa1c69ls14721158wru.0.-pod-prod-gmail; Tue, 02 Aug 2022 03:39:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR7GkeNsFbry0ROh4BPrOA+l4lXeOiZUYAnONUMSlwVbZLDlR0Nm3I4vYEx6gKWSVmJ5VnuF X-Received: by 2002:a5d:64ca:0:b0:220:6247:42c1 with SMTP id f10-20020a5d64ca000000b00220624742c1mr6346037wri.478.1659436785009; Tue, 02 Aug 2022 03:39:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659436785; cv=none; d=google.com; s=arc-20160816; b=uFkFoDMXWHEHafPThZQ+uRw4yncmxAE+D/CYtSfDkzzwPA6Cp503rab/f5oF4zrtgF xdIWxM8QD+7CinaswGgpHzmJwB2ecUuC3D81H/jYw7e0RoyqptB4+y1sX9NgSgHaDPe2 Ox+AMlnSNo9KuS2PyG4NleDeXx/U8Zkgb4c3xbT7ZvbzDrblQoGdBFGP/fp+i2L8jDrb K9ruYygsNuCLK74aBRzWltl09lhkfp+fQ0dYXpcYQ/riZmuS0POCMvlMmK7QF86MMs2r S5jzKBZmduj9cxPXdXS8Paog6PDy33rQjkRyHJjx5FWlEGSrMshPUuJ0rQeNUCj+Uxnt t88g== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=vGmXUnzAuV0J2LdzqWjc99VxrOG1ue4IxIDmBkrn2H0=; b=kf+uAbtzNWjidOthrdXhaUlSrHwGzQO1jzEzdkNNU9IpWEh0wLb5hhoJ03N5SBNYn0 b291yZ1qqFuRFN/FKIVMb/Gd7h1rEssOhUT+X2XqVs2AYeSFxrElocTOSWAHQiNpiu9s 4ye9Qg3dYSOo/Qi1DeQ/jLa42UlFEDHZKGH6DF12DpAiyIhbQ7NnnT2EwLpW3ubIComr l4412iTjp9nyFBpAKXgraCa4JwN4fkJ58UspprYTvYosVIT+XXflovmWtdQwjChM8DCL YRcLTfY43ewOjlQEhlN1eRFoq4ng5x79QsoZgSlziAHutCH2S/x4OCQQoP9AyiJ50kY7 A/Tg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="H22/9eml"; spf=pass (google.com: domain of fm-72506-20220802103944636ce58dfde9cd9594-e2oddt@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-20220802103944636ce58dfde9cd9594-e2oDDt@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id g2-20020adff402000000b0021d835e888fsi493248wro.0.2022.08.02.03.39.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Aug 2022 03:39:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220802103944636ce58dfde9cd9594-e2oddt@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="H22/9eml"; spf=pass (google.com: domain of fm-72506-20220802103944636ce58dfde9cd9594-e2oddt@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-20220802103944636ce58dfde9cd9594-e2oDDt@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20220802103944636ce58dfde9cd9594 for ; Tue, 02 Aug 2022 12:39:44 +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; bh=vGmXUnzAuV0J2LdzqWjc99VxrOG1ue4IxIDmBkrn2H0=; b=H22/9eml9kqTtpl+Cwpqh7INeHmbnqcjwSw/3VcMFOKzayNxtSEt3jUFdHthuKqrtR6bRU 5OSuaMWMyhVazpEch57lnrx4u7gSH3uPMinbmhyXDxBI31O/+AK+X8AlZky0IZyGihUjaFei mSlux69bocKmDSYNXnNJDDyf1WeP4=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: tobiasschmidl@siemens.com, henning.schild@siemens.com, jan.kiszka@siemens.com, amikan@ilbers.de, Felix Moessbauer Subject: [PATCH v3] fix on-first-boot for systemd >= 247 Date: Tue, 2 Aug 2022 12:39:21 +0200 Message-Id: <20220802103921.1481725-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: lY9hJh3cRIVH 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. For older systemd versions, we set it to the empty string which is non-documented, but works as identified in various tests on debian buster (systemd version 241). 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..4a901cbf 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, set to empty string, 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 || echo "0" ) + MACHINE_ID="uninitialized" + if dpkg --compare-versions "$SYSTEMD_VERSION" "lt" "247"; then + MACHINE_ID="" + fi + echo "$MACHINE_ID" | sudo tee '${IMAGE_ROOTFS}/etc/machine-id' 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