From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6695999620571463680 X-Received: by 2002:a1c:6342:: with SMTP id x63mr2384696wmb.58.1559033901815; Tue, 28 May 2019 01:58:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:3c0b:: with SMTP id j11ls610568wma.2.canary-gmail; Tue, 28 May 2019 01:58:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwBP+PK+O5JOeB14+MMnqUMeOBJ2xj0G9gRux3zIni+q2YNDpvQ3kueQ/LvJHyJHK6/nWR+ X-Received: by 2002:a1c:ed16:: with SMTP id l22mr2399263wmh.96.1559033901373; Tue, 28 May 2019 01:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559033901; cv=none; d=google.com; s=arc-20160816; b=KsgmwOysmd6b+RflADDul4ZwHbAf7WW0GOaVzcmJb252pLLRrBfv+yZkdluB3swY4c dJySDg3mUoZJp+rMtDngOoTIQpy5ZKWdjPG4RLJdbikMhODCflpwrpxbd7PtA8Rdu7bp nJF95aCeBVUKFBAJg3/XCkyLLCBEQ7+4fDd935gUGmDTcTO1KQtbIgiyAMiUCC/xwIz2 MmYmGZ2aB1E59w553upQTuRrP4wclWV7Za69JpfF1wKKD1wAax7FgOYD+3DVR2XAsMj/ XU++n3GUf0ULNHpiFC0DzqgCnmFOvqACqcigXVip3zLabmFXfVYRtimstMHOVWtOi22l 85OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=hjIl4bsfCxr9TaVtVNGiDBFLqucZf/5P72fD3jnkp6Q=; b=Uz0TZW/nX5jChNx+0hpf7BohDalKQo5yTfK/7EDkrhth58xbOJqj4fPnpLOMpeozD1 Cg5DKViktWjiLYwgqRUYGPbUmNAL753LZzbPDfbjZKhjtLYbOYNHTTgTM26SBZaoNVrm vaQMFE9jV4SkP7AgJNpbKdkycdSWx9E4vkB1O5TGJO8dFtowy+ViCRMF2fQqlrQQtxcN /cxyKerm7sdoakvhHgZ8AOEHrZGimqcfFf9+vwZ2jmwsDVqOtY1kdsoy0/xP12fa4abi N2t4+SaJzdZPPUsgwJjQQlx8IXLSksUFboTWWGz1JW1z5PRMCHwlxuE5F8wHkWFPPNUM WCrw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id x8si595798wrt.3.2019.05.28.01.58.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 01:58:21 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x4S8wK84011322 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 May 2019 10:58:20 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x4S8wJEl003791; Tue, 28 May 2019 10:58:20 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 3/3] image-postproc-extension: add removal of machine-id Date: Tue, 28 May 2019 10:58:14 +0200 Message-Id: <20190528085814.12967-4-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190528085814.12967-1-claudius.heine.ext@siemens.com> References: <20190528085814.12967-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: cY7rZ5bSLNVE 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. 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' +} -- 2.20.1