From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7171373366228549632 X-Received: by 2002:a2e:3a07:0:b0:279:43be:97d6 with SMTP id h7-20020a2e3a07000000b0027943be97d6mr15825863lja.33.1669718817723; Tue, 29 Nov 2022 02:46:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:780f:0:b0:26f:b780:6802 with SMTP id t15-20020a2e780f000000b0026fb7806802ls2186304ljc.0.-pod-prod-gmail; Tue, 29 Nov 2022 02:46:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf6eYb3cAVNaO/P5WKdfh+nYjLoZI8ERXl20m4QDptjrB1XuhovSLxgAZEIYmjXwLvoTzP/5 X-Received: by 2002:a05:651c:1692:b0:278:ec8c:7923 with SMTP id bd18-20020a05651c169200b00278ec8c7923mr16755914ljb.185.1669718816357; Tue, 29 Nov 2022 02:46:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669718816; cv=none; d=google.com; s=arc-20160816; b=sulzbgSpnlyU9HBUFh1/0Z4RKP17wRLKn5WcsR8v3MaKw2FlOkY/dX93yE1tHie/Pi 1AmfThpkydPgYAybCqWm91jLF4/MkA9/iaFtsABtv9Cj+/l3dE+hmOrt/wKPa3wNWmH2 nmN02xL4Wm1LFjdDM1+6vHgmUc7bHs11frunFIzE3/qL/e7/ZVSNFsiUw3ppxvue9TAI cjZwwW7r1mm+BZsgCpU8EkpCYMUIJ9hxPlYdMTyGutpQpicDuxjg00g3gJxDvf65Lg0j Sv9b/lPwXq44NQ6HiuXJbmUXWAxQPNb9cAIi9MTVXhauO7IcH6YFxcnV60Opeppxd/XK PfeQ== 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=AMOUoS4m5WNte/4RMR9GUuFuCuPRZyretL4thS+3QI4=; b=xTBmVuzDERu5bFBikdcvSBQ/UgAryh8L4YitrIimhNy5Z56nBq2+CYXJfhoHmJRfLJ 6dCcAmcqSeT31GFKe+IcILhC0ziQRJriSg8rJ08//ViDGY5BcsoBDbBtxgHEnyXHQknG kfdEd1xXdDAHIw21kWdWQjMCEYnNFf/IcExf++s7i2XQqJGg0E4sfHI1ZO1SayoCf7Iz lq6K+9mcwY3wKscDTRwPGCCXpI0ynMHqMU1sGRDO/t6XwrrqetsUfE84FKTxWO2FT+yu m2B3ggJfWkTD3fKRH72YgdT+3mKNgwQEiHxFHG5RtN+u2hEbZjocoCgriSyw5rOdkwzn aQmQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="mD7lW/bx"; spf=pass (google.com: domain of fm-51332-20221129104655948f793d4475b56e1a-_g_pxr@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20221129104655948f793d4475b56e1a-_G_Pxr@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id u15-20020a05651c130f00b0027976ad74c9si685344lja.5.2022.11.29.02.46.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Nov 2022 02:46:56 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-20221129104655948f793d4475b56e1a-_g_pxr@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="mD7lW/bx"; spf=pass (google.com: domain of fm-51332-20221129104655948f793d4475b56e1a-_g_pxr@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20221129104655948f793d4475b56e1a-_G_Pxr@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20221129104655948f793d4475b56e1a for ; Tue, 29 Nov 2022 11:46:55 +0100 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=AMOUoS4m5WNte/4RMR9GUuFuCuPRZyretL4thS+3QI4=; b=mD7lW/bxsO1uCIKKU6ocUxe6SCHlheI5Nw2rJDhM6F43+9Ena4JvuSmgRJSzzhklj1Qem2 1VzBPaZVxJWbizkjbEMZi1feqgef0NETYT7sPeJnt3lo7wWIAnDliqm4QEptL4Mx5pfSOjO2 YZnCYl+pqoYQWAo5VbxL6aYY0d44E=; From: Quirin Gylstorff To: isar-users@googlegroups.com, felix.moessbauer@siemens.com, jan.kiszka@siemens.com Subject: [RFC] image-postproc-extension: Configurable systemd first boot Date: Tue, 29 Nov 2022 11:46:54 +0100 Message-Id: <20221129104654.217984-1-Quirin.Gylstorff@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: kdHK/1oMcPUZ From: Quirin Gylstorff The Default implementation will not trigger the first boot condition. In case of a writable root file system systemd will enable all units in /usr/lib/systemd/system with the vendor preset enable. This will also enable units in /usr/lib/systemd/system which are disable during the installation like ssh.socket. This will not happen in a Debian installation as first boot is the installation boot as defined by: "For normal operating system installations, where a custom image is created for a specific machine, /etc/machine-id should be populated during installation." Signed-off-by: Quirin Gylstorff --- meta/classes/image-postproc-extension.bbclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass index 4a901cb..7e3b8e0 100644 --- a/meta/classes/image-postproc-extension.bbclass +++ b/meta/classes/image-postproc-extension.bbclass @@ -53,15 +53,14 @@ image_postprocess_mark() { --build-id "${BUILD_ID}" --variant "${DESCRIPTION}" --version "${PV}" } +ENABLE_SYSTEMD_FIRST_BOOT ??= "0" 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="" + MACHINE_ID="" + if [ "${ENABLE_SYSTEMD_FIRST_BOOT}" = "1" ] && \ + dpkg --compare-versions "$SYSTEMD_VERSION" "gt" "247"; then + MACHINE_ID="uninitialized" fi echo "$MACHINE_ID" | sudo tee '${IMAGE_ROOTFS}/etc/machine-id' sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id' -- 2.35.1