From patchwork Tue Apr 19 07:36:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 1696 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 19 Apr 2022 17:36:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23JFamgO027258 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Apr 2022 17:36:49 +0200 Received: by mail-wm1-f63.google.com with SMTP id k16-20020a7bc310000000b0038e6cf00439sf1406523wmj.0 for ; Tue, 19 Apr 2022 08:36:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650382603; cv=pass; d=google.com; s=arc-20160816; b=l4ZHb9KXlam96qOXDXV95el0kadqfoMjY8VslX/VaSEJmpVC5hp/qRoQG+gZS5MIdr Jzu0MATOJY0novbCzhetaI/VBu0PTkgY6ugvNA/V1S7ZLmA84jTQTlR18IYEnFfLR90d yDf0JXsRBwFTuWANAxj5Wg2ZrGuHfJ/7wdj4JhEtKd/Ed//Z0yjaroS+4dFcqOJU4C7y gvWhBq9iCRwVhpUvMx1xAQZA2SPz/bVHkCB83fohPEX0ca0LMJK10For0qh0sNtkLwhv WnBbpkQ5EqDgVYc6XVpW9sj1Tf6w9+RF+j7IMRboLPWYA/39iunfqxpWShf01w53K+tY /9ag== 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:message-id :date:subject:to:from:sender:dkim-signature; bh=Lva7CL/VIam6GMeQtmfDuftyFZvOhXoB8Micw58UduU=; b=e/6Jmqn7RmzJ+IVIAzn6W81H2zyTzasLufOw9sFYBZF6Nf1rvxq3cQlQy/XwRxS1Vk bB4Hb4nsvI3xNhd2+YCFKkYydHvJjqK5T+/nkUUbpBZdbrkHUEu3+t6G6HFllSv2YAU7 nxcjFsfTm+aFnkw7Nf4bafjvYcg6j2RHOTI4i1aEWnz8Ci4O23u8P8lLUOVDfgMVuvkb XhI2G6KK+/Kg+PXyK2+0yE8Z+1rnEG6ovxXK+u7C9DedwAXQH0x5bfjYKVpyJfo5MZFD 4J8txK0reV6ptd4Yk+5Wj2C9nmMwrtx1cmUMjqu9mwspflABqbhRRR5N3HF9rfWwAcdP cKIA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=XqBxq2qJ; spf=pass (google.com: domain of fm-51332-20220419153641e574b8510e6a2cab7f-ivwexp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-51332-20220419153641e574b8510e6a2cab7f-IvwExp@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=sender:from:to:subject:date:message-id:mime-version:feedback-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Lva7CL/VIam6GMeQtmfDuftyFZvOhXoB8Micw58UduU=; b=q0YFa6M3SQNWOwKNr1j7D3QVXKd6RiBcJ8YUuMcO4LGRm5H2KwRagYMLSP1SOnSPeb KgwYau5bgAOXacXBs3Exf2t0EdfhHfzv05608TbYyo8riH0I8jXuEhdYdHaSJ9qS2N49 CqxqQjE1FohMfKWzbTi4X+6jaUDTBX883og8xB6ZsZfvY9ioJ1DcZT3Hu3E94ytZeAhP PUPbk9WXd3zCmCqMngdJJ9x0qoppIfRWP4nf+1RvGT//337+dMYd9BKYGIQSNLKsJQcQ Q40RKRXx27PrI5KV+iXPuUDZfmcQwRpmpgAzB1Icyt6dLF6lW5JS3dSQ4VQjuzRhN9/k 77vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:subject:date:message-id :mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Lva7CL/VIam6GMeQtmfDuftyFZvOhXoB8Micw58UduU=; b=xsqdRwRAjdN9eoJ5lX6GOwA7n1Xzuznfqb34q3hvpJ1bi/IKsCC/nwmdNwZ9GdKwvQ EFSH8ockVqjhd4TA2USeEXshK56nwmjZN1ayDd72NkLnlfg+WI6Y08nheGz7EmJoYwLR 3F0zNmvZs/rKx6ftS9JLILd+yZX/Rte0WT+C9uHom3LlPhVW3PbyFWvEehd4Kn8mU5Op hQpsDtvYDWzzuMtGxiTfhihg7t81KlAxsHPHbBFA6SbBReQXiEwRe21+dXiMsB7Yt+HO +e+NtSGot/RovCbSrenPkbBuMWyKPTo7ERRRpkZQNvJsCWH0rIXW++GRKjaY69OybAcw k5RQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530uTXPFXbtftODLURIYkhSLAA3dsmB69uXfvSlmMWCocE3+tU3j tJEA5aSwdmcTI1smo1hEOxA= X-Google-Smtp-Source: ABdhPJw4D+6kZgk8oZjtC/ufA2RODvfZ8htgDEeFpMs22HcDDKACDmjbzJN6+xNRSL28Hxtj/YPJVw== X-Received: by 2002:adf:dbc3:0:b0:20a:88bf:6d83 with SMTP id e3-20020adfdbc3000000b0020a88bf6d83mr11789967wrj.301.1650382603150; Tue, 19 Apr 2022 08:36:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3ba1:b0:38e:b80d:4580 with SMTP id n33-20020a05600c3ba100b0038eb80d4580ls1582242wms.0.gmail; Tue, 19 Apr 2022 08:36:42 -0700 (PDT) X-Received: by 2002:a7b:cd82:0:b0:389:77ef:66d7 with SMTP id y2-20020a7bcd82000000b0038977ef66d7mr15791132wmj.171.1650382602238; Tue, 19 Apr 2022 08:36:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650382602; cv=none; d=google.com; s=arc-20160816; b=AT2IEMNiveGIXlAUowmo28bpaX9PuiZN6usnuHizJwXoqLVReoJ03Y3eVdaepuwQrK zFa785Z5R1jKItyjunM2aXHGM8ysLpfs80Dusbys2ydmBIEA0/9A5l9dvbP5eiNzNQpc qqX5mQp5/zRFxpbqCtkQyQ/xNcgUZQWKKPekjJvosvpN1h2n9iq9KfDtyWgNWp9DvK9T /5VlDzNMv6JXcAsMkokO3/VRMfubWyLRcR9E8k5u6SZnxRpSGYZ+pTxSHnsYPCQgHEoa YuwP8E7p9KLGmCkEww6zRczuwnb3vlUGbDRQfjUY9tkAhczTacNzIgMkCFIhNSWYBHI2 GWQw== 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:to:from:dkim-signature; bh=W+z3dzzeI+PmITAtyOPmNUzwGRKHYoVeP5aiCXzHYCQ=; b=XfOsf4hwh7QhQBVNRXaBSXtMR8Kxv9JFcTJDIRIAevX83oiPnoYihdn1ubf1SeGZ2V wV3qW5NnygHcZ7nsj2EfaeH/cGUnOAIX3Jvh6WXIYF0W9NOxodXshZot1cHbtELTcIrn 1RVVltO5i1InYIkRL1B2bRVqfwKKEs0/KQ3pkbQtH6L3PFKehA/pZcUpgj43l5mu1Z30 hHeZaCUWkOrpMTev1fowL+UXphNkTBkSawGufL8a0u7echk34DkDujkP6IXmIx7eIZyT 6wfeZ3fEZRNVoLzy8wlkCU0fkFhzN3xD3n5eQFDhqfQ+T+27f8EwjQf7FXbrm2gWNjQu ibgg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=XqBxq2qJ; spf=pass (google.com: domain of fm-51332-20220419153641e574b8510e6a2cab7f-ivwexp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-51332-20220419153641e574b8510e6a2cab7f-IvwExp@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id az13-20020adfe18d000000b00207bbe754f2si661998wrb.7.2022.04.19.08.36.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2022 08:36:42 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-20220419153641e574b8510e6a2cab7f-ivwexp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20220419153641e574b8510e6a2cab7f for ; Tue, 19 Apr 2022 17:36:41 +0200 From: "Q. Gylstorff" To: jan.kiszka@siemens.com, isar-users@googlegroups.com Subject: [PATCH] classes/image-postproc-extension: Remove /etc/machine-id Date: Tue, 19 Apr 2022 17:36:40 +0200 Message-Id: <20220419153640.222797-1-Quirin.Gylstorff@siemens.com> 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=XqBxq2qJ; spf=pass (google.com: domain of fm-51332-20220419153641e574b8510e6a2cab7f-ivwexp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-51332-20220419153641e574b8510e6a2cab7f-IvwExp@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: INBOX From: kas In a read-only system the machine id should be deleted or set to `unitialized\n`[1]. Systemd will generate a new machine-id during the first boot. In the case of a read-only root file system Systemd generates a mount point with the machine id. If an overlay for /etc is used this creates a mount conflict. To avoid the conflict between the overlay filesystem and systemd /etc/machine-id mount point deleted the file /etc/machine-id. [1]: https://systemd.io/BUILDING_IMAGES/ Signed-off-by: Quirin Gylstorff --- meta/classes/image-postproc-extension.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass index ca520273..0c412c0d 100644 --- a/meta/classes/image-postproc-extension.bbclass +++ b/meta/classes/image-postproc-extension.bbclass @@ -57,7 +57,7 @@ ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id" image_postprocess_machine_id() { # systemd(1) takes care of recreating the machine-id on first boot sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id' - sudo install -m 644 '/dev/null' '${IMAGE_ROOTFS}/etc/machine-id' + sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id' } ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_sshd_key_regen"