From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6695999620571463680 X-Received: by 2002:adf:e309:: with SMTP id b9mr30581174wrj.135.1559841526702; Thu, 06 Jun 2019 10:18:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cb50:: with SMTP id v16ls801790wmj.3.gmail; Thu, 06 Jun 2019 10:18:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/c6oiZW1q79OhdKbnkvNhWnUBcvlwFo7ZIEvhLHcaQoDai3c3ZnVqRzCv0rv55dPsByU/ X-Received: by 2002:a1c:e702:: with SMTP id e2mr776922wmh.38.1559841526188; Thu, 06 Jun 2019 10:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559841526; cv=none; d=google.com; s=arc-20160816; b=ne9oIqAg6XuIMtnC6Ki0sR+V3M8/KeE135zDLjjlPuZAf4W+GFjfP35/5BLUVpOiNd /+EeMNT+BdepUTQGFso1kdlV7Cb6qxSQHPbGqRVMXjZTgCr5wyJGJlahsC+acDt9LwR7 wDtBM8pihFxn9oDRQQwBN2IN6jH5uPzKLuhYa8V9i9GWcAOu4khoj08Zh+yVm2W6+Xjg /l1aMKH4FljO6uZGT8wFS4VDLoWCziC/DpyvYD67Ro6kpT4RGtHcJE/bpoUMDSru1SuM umra0+WsWQm4kyX3VmW+3m3qOJwRUDexFGksUYyTjISfD7UTNjGbGZmMoskftr0ItMjR dLMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=zPA7jaEcm0owKBdOlmLbnJfwfUOs3FcDSG7C1J14Khg=; b=qoi2VbjSRzi8DV7lJ64zadX9a6GyP0qPJCd2/pzS4cAbgGf5skIG42pENr8SoGVdDu zkDV2VDQQ0+JcnV7y7ELdffTee/ZG2ly1y8LyD82fj9zHDvB3wJb2m/UU7UNoGiorrV9 D7Zt0mE/QtEyJt+xmMrJ+zRhbkdVNtfWiK5hWoL5SKSe4blW+jFWANUK1sUN1lgmFDLK 9sBXxOqbZ+fipOpPVHXX7y3u3qjWrKiuEq8jZ3WrXndmN9VkdHUlYvAC89N0OS5jmA6m 2NwvtgZlOLQvRg0TA9OafKKZwHm2to1Y5CNIUR+TDYBm670JC7ZgiK5A8gdFeFBYqs5Z eLQQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@isar-build.org designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@isar-build.org Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id h13si43804wrt.4.2019.06.06.10.18.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Jun 2019 10:18:46 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@isar-build.org designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@isar-build.org designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@isar-build.org Received: from [192.168.1.29] (195.165-131-109.adsl-dyn.isp.belgacom.be [109.131.165.195] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x56HIV5O006738 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 6 Jun 2019 19:18:39 +0200 Subject: Re: [PATCH 3/3] image-postproc-extension: add removal of machine-id To: claudius.heine.ext@siemens.com, isar-users@googlegroups.com Cc: Claudius Heine References: <20190528085814.12967-1-claudius.heine.ext@siemens.com> <20190528085814.12967-4-claudius.heine.ext@siemens.com> From: "Maxim Yu. Osipov" Message-ID: <73b80822-5adb-7696-2f2b-7ed6b64a88be@isar-build.org> Date: Thu, 6 Jun 2019 19:18:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190528085814.12967-4-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED 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-TUID: i32pZv+tsi/c On 5/28/19 10:58 AM, claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > The machine-id(5) should contain a unique id of the machine, but since > this file is created by the systemd postinst script, every machine using > the same image would have the same id. > > The file is removed in a postprocessing step and will be regenerated by > systemd on the first boot. Applied to the 'next'. Regards, Maxim. > Signed-off-by: Claudius Heine > --- > meta/classes/image-postproc-extension.bbclass | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass > index 625ba7d..495eae6 100644 > --- a/meta/classes/image-postproc-extension.bbclass > +++ b/meta/classes/image-postproc-extension.bbclass > @@ -26,8 +26,7 @@ update_etc_os_release() { > fi > } > > -ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_configure image_postprocess_mark" > - > +ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_configure" > image_postprocess_configure() { > # Configure root filesystem > if [ -n "${DISTRO_CONFIG_SCRIPT}" ]; then > @@ -39,8 +38,16 @@ image_postprocess_configure() { > fi > } > > +ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_mark" > + > image_postprocess_mark() { > BUILD_ID=$(get_build_id) > update_etc_os_release \ > --build-id "${BUILD_ID}" --variant "${DESCRIPTION}" > } > + > +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}/etc/machine-id' > +} >