From patchwork Wed Sep 4 17:16:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 3784 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 04 Sep 2024 19:16:53 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f187.google.com (mail-qt1-f187.google.com [209.85.160.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 484HGqVA004093 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 4 Sep 2024 19:16:53 +0200 Received: by mail-qt1-f187.google.com with SMTP id d75a77b69052e-45694969ca3sf71890991cf.3 for ; Wed, 04 Sep 2024 10:16:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1725470207; cv=pass; d=google.com; s=arc-20240605; b=H3z0CuOukpvxKNYMg7lBpmXXzjYITd1z8kIJPGv/JfEDgW4SlLioxucCP4/eqMDuhB ZVP3xHx668ynY+c0Fv2sufzZfkqfGWdjl+E1c8WOkiobe2235wWtVUsYguHC+3nPmv0X NDB8AkKLy069QU60tM+3OdH3HIbhbp7WLVY+CGLxHw5Yvbsmg+ePIlcH0vBA8omJKQ4S FeT7d5dk076NO1VshD6w3NqrV3SLUdT4np0k6BgOpuLWAUgB9UNC0aFLxVJesEZO4d/t U4dR3w9qqkWWxSGJbMXmB7IrIOsE+NPveHOJm0tdttyu6SFLQmEHXNzrEcYPaMte87KF vyvw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=rYhoa4m9bTArYmnAe06EOg/tlYibMRzBrmexCqCQEwY=; fh=7vcDf19Hp48QDZPwtVwHiBvoZbtHIAuRyuIthLgzLw4=; b=Rk8uOem0NhTgn5We3eoCgJDzi+MRtA6E2QFUPS4vJD9Z0rrmWLdqI8unkFpNqXrVua fJ+zvrz4GgqDYd+topM0cirakGK5VOM1cWDuefuiMmHcARIDBMVLrnXsppEHdCHk2A2N GCQx9wAihNR4JfTBI5TXt/FxNAP5fc/JXzUrFm9l+gf5ffgc/FaOJjQ00qyp1aPlkTMk XPQjPY7OQIC+WpUieBb2CBbiyZHBkUQDgkUyOKm3E5hN5OpeGC+GEbM0KcBidYNCSMaQ 3YrTJmB/vHu3kSyvrzIbcUwtnrtZlMlLyiD8jrmXwQYRu2H+HA8TUwJ7l7a7XRdm3aL5 mckw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Po1q9eiV; spf=pass (google.com: domain of fm-1326448-20240904171643cbed3315fe4c4004c7-9dwemh@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1326448-20240904171643cbed3315fe4c4004c7-9dweMH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1725470207; x=1726075007; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=rYhoa4m9bTArYmnAe06EOg/tlYibMRzBrmexCqCQEwY=; b=tkTRpqsGRL7CIpRq35Fyfutv4QprCpgccRmrqOsJEEu3YI/xFAXcydswUJFLbSLy/5 okw39osEOEo/4YVFU5P6hGQlwdj6CRum4KceuhIurI3i2LdVfywRwbMhqgJkUbjEl/bw OAHP9cwbQlUfdrRImVYsrwEHK7p2LtD0DbRzMmF39t4+AmeSBhXwHRYiIJye7cw64f0Q sSL0ZLHAzJAMKkw2KvcqAqjvhF2eOqXpXhrKOqOVo8l78PP5vH2m2u1wy32hFbFav/S0 sRC+VyGvcB1ujbscLgGF24KQ4PMLCgCP770DASD7BuA5MfSGp3akgGIw+n50HoZvv+CE A1zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725470207; x=1726075007; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rYhoa4m9bTArYmnAe06EOg/tlYibMRzBrmexCqCQEwY=; b=ELxx4kKmb7fb61cFb6W01nkT/gciBrNZuiZGyqS98VMw9moUu39QWGDRL02L1NFFYM f+7/OinFE/4H7i0S9rP16iIwch+/FAY/WV2bgNqbhYKkts0bOBhJ8MjULuG/evDIZkGD X4MVmnAYjhjSnU7luC1xQh1qk6IQGZg4QwTiqLn1Vaa4QXTkY5Kbu9rd7OeaqwXalmek /geNZ+sT28IJ4EaqCT8p5s0aRZJzQuZ5kZTVZiOMsD4F1xg1fgaeQqPhOAnpzLeGPbE5 SdRfzQp83kIHxxmUrE5hGqqB1zwPirvI9ILzqs1O2Mo5bE2TTD4GZwLrwsWDPhSeD3iE fozw== X-Forwarded-Encrypted: i=2; AJvYcCVulwqwYb4BfGxZNMpEmCRjvrKLDI9/nNLcvKwCuyCUJCTErMRdKyvtoSVBLX/I9loSarPL1IQ=@isar-build.org X-Gm-Message-State: AOJu0Yxpm2v7joSLGm5sZs2N+j5YmFlVQCtrPXsyzgC5MMCivNJgvwbm LNLpA19Lit1wpRNO7+/h9udApb7z9mHXZ509mTw5g6S3soGc6eqw X-Google-Smtp-Source: AGHT+IEBJTlCLQuvdUn2hfzEFfnmCcba8G4xqP1Gh4jfy3f4hUPKTwuAlg2TI6SsLW+Mh+NllczYsA== X-Received: by 2002:a05:622a:22a8:b0:457:d1e9:fc21 with SMTP id d75a77b69052e-457e2dc51efmr84658191cf.33.1725470206525; Wed, 04 Sep 2024 10:16:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:104:b0:44b:e6db:de28 with SMTP id d75a77b69052e-45801026615ls821941cf.2.-pod-prod-04-us; Wed, 04 Sep 2024 10:16:45 -0700 (PDT) X-Received: by 2002:a05:6102:512c:b0:492:876e:6d15 with SMTP id ada2fe7eead31-49ba89d5d33mr8917621137.8.1725470205174; Wed, 04 Sep 2024 10:16:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725470205; cv=none; d=google.com; s=arc-20160816; b=b+QgEPgj9+kV/Xr6gnRHdLLNWhDYglM2RfkjTNkK8XgPuUMSDYXZ5yC1Xfq+ZwLgP9 y8EwfTiFIi6WVDeB8XUagpDUdIf+L5OLXBbElBfzzG7CI6/Kt9esz0BuP/pVXEwA+xPB 68NrBDr5tPefhMg8PslvxjtmY121Vu9TSqS/V3bDuF2HJrN04ZjrGeRyN9dnKSL9mww1 h880o2PpfbOt900VHoL/CVqKKCga8hcQEoehSk4HPs5mUUHKFz2JPya4J6ikPSGFNnds DVDE/DBI5ETpGDG5XCMB3Y7ePjnwpbI3JwGc2KzioyYk4rm9qG9PyloVEUnSGcEwanAj J/Mg== 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:cc:to:from:dkim-signature; bh=zo8Yf6XUhoYI01aDQ1sLM7uzt92lcF2BI7uQOT8Ka5U=; fh=cSv2H02vVfo85sMV2xOoCfqDxR8qzxE6ZGdxprm5KA8=; b=C3YK/BVrzrNii0DqJcsNHYnL+zIdACxKvXXS0SXCCTeTP9RKppm6kkazdbeBd4uaBc QZfvBNhG/B17my2Nmlwja3njH8TfbCTrO1GHshAtuo0ohqnLZoCxX0WhiTnSJuLrrCf6 z6mR3CI9tQQRFXb0d6rFXm2l+QrwOPkjt4k27A8qu7nckM6kYfBUiYJjw7+KtSos/pdh OA0I8y2ulYy7GZ7LQ3U2KsdjOJzdibfkeG27BA8xBu/GvMp9BYumPWY2lNtrTHi7NNIY 0K/lezSB2Y8GdAiBTsMiZAj3/jJocXf4s1HZeRTig6bX4uamoCPpOkmNU9H6WdZfJVrC Hkfw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Po1q9eiV; spf=pass (google.com: domain of fm-1326448-20240904171643cbed3315fe4c4004c7-9dwemh@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1326448-20240904171643cbed3315fe4c4004c7-9dweMH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ada2fe7eead31-49a5f277c0dsi749189137.0.2024.09.04.10.16.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Sep 2024 10:16:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-20240904171643cbed3315fe4c4004c7-9dwemh@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20240904171643cbed3315fe4c4004c7 for ; Wed, 04 Sep 2024 19:16:43 +0200 X-Patchwork-Original-From: "alexander.heinisch via isar-users" From: "alexander.heinisch" To: isar-users@googlegroups.com Cc: quirin.gylstorff@siemens.com, jan.kiszka@siemens.com, Alexander Heinisch Subject: [PATCH] meta: Add option to specify additional dependencies for package expand-on-first-boot in case an encrypted disk has to be resized Date: Wed, 4 Sep 2024 19:16:14 +0200 Message-ID: <20240904171614.138923-1-alexander.heinisch@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1326448:519-21489:flowmailer X-Original-Sender: alexander.heinisch@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Po1q9eiV; spf=pass (google.com: domain of fm-1326448-20240904171643cbed3315fe4c4004c7-9dwemh@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1326448-20240904171643cbed3315fe4c4004c7-9dweMH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: alexander.heinisch@siemens.com Reply-To: alexander.heinisch@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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: Alexander Heinisch Although, disk encryption itself is not handled in isar (as of now), downstream projects using disk encryption break this package. To mitigate this, we added an additional variable to specify debian packages to be installed, when disk encryption is used. Depending on the specific implementation (tpm, password prompt, ...) downstream projects can set the dependencies needed for their strategy to handle the resize. Note: We decided against fixing this by bbappending in downstream packages, because we believe this approach scales better and is also easier to maintain. Signed-off-by: Alexander Heinisch --- .../expand-on-first-boot/expand-on-first-boot_1.5.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.5.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.5.bb index 1b5b066b..ea52ae9e 100644 --- a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.5.bb +++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.5.bb @@ -10,7 +10,9 @@ inherit dpkg-raw DESCRIPTION = "This service grows the last partition to the full medium during first boot" MAINTAINER = "isar-users " -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux" +# Additional packages that are needed to resize the disk if it is encrypted. +ADDITIONAL_DISK_ENCRYPTION_PACKAGES ?= "" +DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux, ${ADDITIONAL_DISK_ENCRYPTION_PACKAGES}" SRC_URI = " \ file://expand-on-first-boot.service \