From patchwork Tue Apr 19 23:28:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 1697 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 20 Apr 2022 09:28:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23K7SipX029745 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Apr 2022 09:28:45 +0200 Received: by mail-wm1-f59.google.com with SMTP id 125-20020a1c0283000000b003928cd3853asf2067290wmc.9 for ; Wed, 20 Apr 2022 00:28:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650439719; cv=pass; d=google.com; s=arc-20160816; b=bqY3tx7wczEjHCrCBrWHUi7WNdEgEJmsQSen179WxCVOdZm72s4soY5IARmgl2zsCZ KqGFHxDfy8iqKYbrQEsLktPqwpQHm4lsnWmcpX7vHiEBKvEujOV0TzyDU88VV2uPaYvB OeW39trO4V2BRPonFO5VsEhvypJZToAwrV10qPFf5OBv93g2bW0aPy8FfiCXstnnEW+t cqUlIpeG12Ukxrr79mfpdWRODw0qG6j2Yi4ynipFKjRAYNOSjdoIu3nrFSUIxEnSUDiO 9bdo8OKXCzOsUZElrmLmjp0zuwoSKQH0j4g9wzEDj3xyquI8qUEtDKiTAcjgM2C8A/qS PV5Q== 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=4OI7vFvGs/3nYhujuDCS2v1RJd7Nps1hAUT7MKMJ7L0=; b=fmtPK/aYn+VLjQWiPOCsCl7wmFqPyjk1/vyxqPCwt4w9bdwuH7VfyAzBZY6i6sgoE6 C6sRb7n4yV0ej0wOi33avn6OUSRYayzqgEaGedu8GNwNTgH/zFxxQWhItGM7i1G+OgPN FdqMOeuFe66MZGmNSlfNMqJfZZgbq320NpsdeH85MRswUnxTtkuz124ViBNmuWVwAQQK bBPRR6bJKVhHeG8IK2KcV5SDgA2WT8Px4azmWOGcNlyfKPrFR7IpAYv3q0ksWTXEiUyN G1jTQjTBqKizQoKFkAgkMy+Hqx/1XBHr8JBSjR4skroGn4cgiM4blwgGnDBrZT74MF8S zKeg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BlnZod8u; spf=pass (google.com: domain of fm-51332-20220420072837d656410bbed8caf4c9-tkq3hn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20220420072837d656410bbed8caf4c9-tKQ3HN@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:in-reply-to:references :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=4OI7vFvGs/3nYhujuDCS2v1RJd7Nps1hAUT7MKMJ7L0=; b=VczkLP3A/KXkBF8mZvP0uivZUPUtE3HafHiPzK1HJtsBrQb+ojpSToMB1zzv7/eMgn FaFHgozY9Ol3oG5tpS0wmqHTNDl1WBMrvMTCSbooM/KrKtRknVHSB+1POiqfWI61L0WE ZceBrZQfSwc3XpjXWvtXDj/zTOdwLobNtAHBt3Elf2vy9h1UyvBMipZJLQnK3+LSVgFm +T+dUNtvEGy/vnP1PRHWM6sRmKR3tlzu1FET+6uTLjT09fQZwqw3clhy6BnOpWEcj9Lu mFwEUKgx2hIkrK5WRQWfPvajoXS+jAjYgkt4Fj24v4CnNvlAqm+J3RUwhMepR/WOiDFy kIBg== 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 :in-reply-to:references: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=4OI7vFvGs/3nYhujuDCS2v1RJd7Nps1hAUT7MKMJ7L0=; b=uw7lbl7eaaYiS6mzLOidpyDSGBibKCkJenF0mIj4XGQe0Y+v0J1d0yOF/Vc5p487CQ XWj/0/irc6iEECDpMBjbI2vXKpgGGRdbZxrsX3O/y4TPN//aRv/jAwxZtkCTjtxi4Jqg h05NcnxWO4ZY5OhVuik34mfZf5OOpMPWGAlzRmWhV/wT9CxsmrjU5CDcJOdpyqHJ7uVM 6yxapEoLggNw8Bx62EpbyIC3nKBK/+re+6EC73IPc4l6gvm4Lo8KxSNTv5imZ8HDUWjq YiMnzLFcNruG4rOWwAstWNnykEHz7/gSMhnpqoNvrVxpF0f9xypZMe6JPYPQK+XKEbyx 6A4w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5334JQ3aDXMZmHf1cntxHNoWJqbE7eYpJvYDQKHILAW6UsAJu/YZ CZ74lFoMNYiEeJfdcoYNoTk= X-Google-Smtp-Source: ABdhPJy7PFf8YhEQdXkXysNqaryZt+Ijp3YPvAxTLQGdKBTmULAJhaS23dRU6s85KUZBcVCPahajBw== X-Received: by 2002:a05:600c:35cd:b0:392:8e1a:18b7 with SMTP id r13-20020a05600c35cd00b003928e1a18b7mr2311971wmq.112.1650439719486; Wed, 20 Apr 2022 00:28:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1d8c:b0:207:aa22:e989 with SMTP id bk12-20020a0560001d8c00b00207aa22e989ls748380wrb.1.gmail; Wed, 20 Apr 2022 00:28:38 -0700 (PDT) X-Received: by 2002:a05:6000:71c:b0:207:a807:e297 with SMTP id bs28-20020a056000071c00b00207a807e297mr14192416wrb.596.1650439718571; Wed, 20 Apr 2022 00:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650439718; cv=none; d=google.com; s=arc-20160816; b=0QPuYr7Gd/yC0b08gi5yVeI+izKXLw5T/+tDb9/1tGkVyTaFiIu7hx6McC/L+kXcCH JP3zvDotnl9b44PTTCxKWac2eP8k3g1OSdU4EiYuRSDbr9yRUphFr3j5XTUJTJ3EwFhP ON5wkJTVhL/7Q+dtAwktck0ku5bxall3AaPNhMXHnfF6TnxJyJnztd/sD4PHRDbx25bM SvsPjcNtkd2yKDoyEo/ZMW74HUCJGqA5AbXeWDcE3iRGavs+9FVmBqBIZndt1BoMcCLc nYXE36IoRUJAIIPRESpSAEmloMXTrUjNgAsbOqqTld2QsG5iJJL9DwgDVqumaN8YmfOd UDsw== 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=iwUnCn1R4zPr4J9lgeVuj2Ds4oIK2OlJRFEG6ZbriK8=; b=BtTUhdWcc0te4TLxp+9MKMQrmsReuHWEMJzhb1/p3gf8cER3WV/YxVN8I2dnBKa5T+ SVmTs68ic+fQHn/AqZvuaLDTTYsmA6MBxArX36N57qJTkpdn+SBBKqvOZBvO7hD4VYsl 0FzwuqhDDhdRXueSje0EG44+BILfW0vWP48u3yhaXfoPYGaRv60/8dFeDr5IUTuKdJ45 8Kc/PtjHCAULRPQ3jr74wGkfM3pkAN8X6emHqOU3khE+0mmi/S0FUgHH1BzuNkrlU5uG OpvwJronFXBMJcdskIKRvjAWaVRhuEr9tLwJwSXWajSX6UJfbUOkhk+ZHb6Ua2OQ6NkN fjRw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BlnZod8u; spf=pass (google.com: domain of fm-51332-20220420072837d656410bbed8caf4c9-tkq3hn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20220420072837d656410bbed8caf4c9-tKQ3HN@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-227.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id x20-20020a05600c21d400b0038c73e87e1asi297748wmj.0.2022.04.20.00.28.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Apr 2022 00:28:38 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-20220420072837d656410bbed8caf4c9-tkq3hn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.flowmailer.net with ESMTPSA id 20220420072837d656410bbed8caf4c9 for ; Wed, 20 Apr 2022 09:28:38 +0200 From: Quirin Gylstorff To: jan.kiszka@siemens.com, isar-users@googlegroups.com Subject: [PATCH v2] classes/image-postproc-extension: Remove /etc/machine-id Date: Wed, 20 Apr 2022 09:28:36 +0200 Message-Id: <20220420072836.324028-1-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220419153640.222797-1-Quirin.Gylstorff@siemens.com> References: <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=BlnZod8u; spf=pass (google.com: domain of fm-51332-20220420072837d656410bbed8caf4c9-tkq3hn@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-20220420072837d656410bbed8caf4c9-tKQ3HN@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. This partly reverts 98d6a72d3064. The man page[2] was updated for Debian Bullseye to allow a missing machine id. For Debian Bullseye it reads: ``` For operating system images which are created once and used on multiple machines, for example for containers or in the cloud, /etc/machine-id should be either missing or an empty file in the generic file system image ``` [1]: https://systemd.io/BUILDING_IMAGES/ [2]: https://manpages.debian.org/bullseye/systemd/machine-id.5.en.html Signed-off-by: Quirin Gylstorff --- Changes V2: - add information about revert of 98d6a72d3064 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"