From patchwork Tue Nov 29 10:46:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 2238 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 29 Nov 2022 11:47:03 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2ATAl3TI000464 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Nov 2022 11:47:03 +0100 Received: by mail-lj1-f191.google.com with SMTP id w21-20020a05651c119500b002797c24427asf3010873ljo.4; Tue, 29 Nov 2022 02:47:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669718818; cv=pass; d=google.com; s=arc-20160816; b=TFuZGVFaxxDJAW7LrvxkVfKWE3+1JdZBnBLX+4E9KiETtADNuIcPUMzoMHmcRrs7CE xu5mNQfFhdF7fOnwks31aZORPiroRcpLcmPfCo/+WRsqOU0dk6u6dYF0Mm5y9AnW7mEE xp4/PXcWTws9USpU6PPWwpRQTvEW4JmquV73PuSDwHnVv5hC2Kkg2GTUNQ7mjQMRqTkn IniOC4e8eYs3WKY67tfOXlYchutAC8UBKyIuwuCh+WDC248Dt//PMRLnFoI30+WAMfyH 5ma4KPH4yid/72d7BlTJwZwI6aLaiIvJcf0G4TuQlnaAau8TbYcMqUyaPegSd5lt+d2/ WbUw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:to:from:sender:dkim-signature; bh=o8xZO1vLveCEKPPR0aEBdo1/ssWiYs+MNoJWE/dLBfA=; b=CHUAH7E+UEPj0RBFXmWOjMzHpvlnMOClpQzNlP/4NOZ5jY7OMZgitnZRPL8xnRtoKf iPZpSSZ/qA/lFVorHAJxzqDGGqW8T196fWiT/XTvyNOO+dnjwTOQAUCDz9Oa4hbv9q2u TaRxcBSfS4KNUce5Zla5hGdjfTKpL11PIq+nR5l9ev5/xA6YOLVk8iArIuB/IlJOJHpo wJLy2WxWoOUn0dKGTLdPgBL+olwjpQ5XTxFn+9n/uJauFATABb/Ig3i/3MLjELoy+5LE eKAY8GELBZkLo4I3+/ixuZqmmKq7qwtxDKzrgks8r/wVKLiGSm11+QSav5BuTr4Do/dD jsMg== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=o8xZO1vLveCEKPPR0aEBdo1/ssWiYs+MNoJWE/dLBfA=; b=Sqvj6ymA/uCD2J2vxTDPpBgFtK6SC+LEzSdvnrLwgNC5kv05vyCqb66T+CP+eIMrKM 1C/Bm1kOUop0h0WkmT7/gsEUnYUCe/dXR+a88/HWlC72hnzay5mqeD9vevxN6AzizG9O qJZz2X+Zfqz/eJWniX7SbbuQY6mkASgd7qSviyC6vJdRgt7Z84VjxsKyO5rSZsYLp0wp Qbkp3w3/2PkI3WtKMbvqYQTmyPDA5NJ4hZCSCcI8b64gd3toRZ+v3oQXzc0Ok0L2WJtQ n8YkslnF585wnq/ZhQhiA/9OAaiXa2wpTBTMwmZrh1YN8XwA2NuPxxpkva3rEY1DiaHH 70Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=o8xZO1vLveCEKPPR0aEBdo1/ssWiYs+MNoJWE/dLBfA=; b=cRkDtFMGg5+3JqFiK2RxA7auMTYmnRtji3WKdCaQDPqkc3Zjrf1A/qF1RfLF49vXp3 T4Hc3cfC71rY2gU/qelIs9svPcJksbQ0rZxXv8ISgU4aBkZV+rR9ltTa6BRKcJLUv3SP IVRgX0hsfo5Vy2RluXLB8QDEwTOzulLa2kGFVckkNkdVRgjfHI7/jjjsW71EkA2P+ktw MYUO3czq5u7np4KfwowJZ5MbmuvoYa4ZSChMZEBfXW/9MCrQjbJpmIWVQ0l/Va7iEbPy 8uhHVyNQd+eDM8e9cdn0Hb7N1CCjOYEAVrheRAMv84jcLI+1VWu2kFIpOxUb5TCasbIL PNKw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5png7BH/TwDRUu73G68fCtBJBjPrVZq2+BrViKaPO7RxeWe599sS MZxxV5zCi2WS4kqRDfCmB3w= X-Google-Smtp-Source: AA0mqf7M+f+yIwHefnwn5S7/0UwBAmi5fQKQdr/5gZkID2QlvcRLNXSd1XUl0diHqGvbTagn5Q5dyg== X-Received: by 2002:a19:5f56:0:b0:4b4:107f:40c with SMTP id a22-20020a195f56000000b004b4107f040cmr21069287lfj.396.1669718817639; 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-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 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; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20221129104655948f793d4475b56e1a for ; Tue, 29 Nov 2022 11:46:55 +0100 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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'