From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7122950100315275264 X-Received: by 2002:adf:f487:0:b0:21e:87de:94bb with SMTP id l7-20020adff487000000b0021e87de94bbmr4639093wro.303.1658783379446; Mon, 25 Jul 2022 14:09:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:257:b0:21d:a0b5:24ab with SMTP id m23-20020a056000025700b0021da0b524abls1045994wrz.1.-pod-prod-gmail; Mon, 25 Jul 2022 14:09:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tqvisDYs0jBSOpkoM63ouS6VHHnNHmDlpJ5vK6MgBbUpbgfsI/FiD/WLN/OJ9lLL2ourZd X-Received: by 2002:a05:6000:511:b0:21e:503e:d964 with SMTP id a17-20020a056000051100b0021e503ed964mr8612390wrf.306.1658783378452; Mon, 25 Jul 2022 14:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658783378; cv=none; d=google.com; s=arc-20160816; b=OT1U3oyZjQG2mpX0LLjn2k6BT5yQkAxZ9QJGYfpF/zl72gLMnBKYupjmASyZzuGYWZ ES9iwrXOFy9z35kofasLcOZrB+DtOqThXWOd0XK+3sd8XidxFCG8KijHk+s3P7VEOKUF 2CpEeHOqIF4ITIZQqKnsnBX4w+SE7l00W2GWjwjdWBBeJWgN/g1+xZdBjhv7t72f579I /TknQYoGNV4h7pSB89UurtO8udjYjf45AmV4c+zExpEngAPEh5d7qT/2fEpPfzvWVeku EZj++srXsXmXW8YsbGlq/68OwViNTuZteKF762oiODajMorgeF1UlGpW12FevV8SaQXj WOwA== 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=c9GbycJ5CNbxXow+QHdLzV4G3NhihidxJBlGvF1+8y8=; b=eIGfE8Mf5WtAzUa9t7Ey4bq9uguilv8EsqA2QSrPwRkSYx0/FhJGPuzPxo84zCu9TV /jHPenpoz4NDOnAgkN4M+wGFSPDGLauJUqHJaFUw64ND2wkJTzSynRhIX4bp0v7BwB1J SEvxgzOzVN9IU4kvrB/Hm0OPxRse7Rsr2il7q1Olsoq6gBnM7KHRNhapc1gshuTYoqI9 Gqu2dqIV1K/QZrCTHy1Va9EZa9pnuqLV3qsht56UoXp36sFsj60JbUFsma/Dyw8St6Z4 k3ldjDqZKHpy7GqhCD93W3txafRnhOPAKkEpKN9q4ubRG79QrDpgZSRi5QQhfVeD4cQt eg/A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=TkSxFThz; spf=pass (google.com: domain of fm-72506-20220725210937cac14a7184b482769f-gzxyy0@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20220725210937cac14a7184b482769f-gZxyY0@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id u16-20020a05600c00d000b003a2ca59af2dsi608182wmm.1.2022.07.25.14.09.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jul 2022 14:09:38 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220725210937cac14a7184b482769f-gzxyy0@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=TkSxFThz; spf=pass (google.com: domain of fm-72506-20220725210937cac14a7184b482769f-gzxyy0@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20220725210937cac14a7184b482769f-gZxyY0@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20220725210937cac14a7184b482769f for ; Mon, 25 Jul 2022 23:09:38 +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=c9GbycJ5CNbxXow+QHdLzV4G3NhihidxJBlGvF1+8y8=; b=TkSxFThzX1wSPKR2evQZcABJEglvno/UeO2w8foXXqV202jmll5KbO7BXwajeylzvF1yOF tguIuSH7SvSomTCzAxKxX4p0tJtHSdT1fhUGNw3slPTPhtQ65muiQ/e8HbY7Lqu7yG3IU9a+ KdFGdb0P0H27Dbwx0YkWrTaUll/Eo=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: tobiasschmidl@siemens.com, henning.schild@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v2 1/1] fix on-first-boot for systemd >= 247 Date: Mon, 25 Jul 2022 23:09:15 +0200 Message-Id: <20220725210915.3008422-2-felix.moessbauer@siemens.com> In-Reply-To: <20220725210915.3008422-1-felix.moessbauer@siemens.com> References: <20220725210915.3008422-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: Lw7O+XnLs1z5 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..f9e26c1e 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 || echo "0" ) + 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