From patchwork Thu Sep 5 07:21: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: 3785 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 05 Sep 2024 09:21:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ot1-f62.google.com (mail-ot1-f62.google.com [209.85.210.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4857Llrf007734 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 5 Sep 2024 09:21:48 +0200 Received: by mail-ot1-f62.google.com with SMTP id 46e09a7af769-70f5e9f757dsf1205625a34.0 for ; Thu, 05 Sep 2024 00:21:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1725520902; cv=pass; d=google.com; s=arc-20240605; b=jlwXd7CxZTq1TtAc2ROVafmPw09dHH+zgWzSd3jSBD97L2VxdSunKYETa10ZgKKrW5 KoovPk2evWOs7txKaTkcXuoJQLZKzVMy9RBcR8ZbZ0dLI9sNnXskqYaNRWSF9nwE1QhT yTp3km4ioCc2e7qm5MaatE8YAqKQjYNkGjk5VDKHQhW+444bG8SsOBQy+ABoMdZ5VoAU grXhyt+ZINIiJP53rqIV/1gVcDGYplbez+doWlPSo9NYHA1tnDh6YkNNU/DAyTHDJNoX 1xlQQrwcXNKS3imOFrDXb+4hNJiSIewDW7DEDOXokGscFMiDp91utuvY25KUlvxL/gf+ LmAw== 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=uut0yYQmz66y9BWLhQkcpshN2iBpucTSfFe4btWhXKE=; fh=8IgC5vZwI89Hj0eE9q6QiAS3WLSzcib2fdJbgxEQR94=; b=SdnGYo7xp8eCbRxUGhG8gi3eqpZD0oMs4enuOH/oB8wS19R6Sr+nXd1XqxYXaF06oK b5rsHTpqSCQsIv1cIj4ax3BU16iRTSZHchAwa0WyGvQQ+F9KcOk8UDTaw0aiVsZgfUR1 uSgHnPbbcYgmYq+kiSKhyVSDgZ3P9CdpK41NWok14ul0P8f6IWdSrQpfZ27wb8TppVFw u5tNf1kggTWKbEUIpu7ncwhcpjp8qwq+JxjstRz7MlHyEjVq3S5MYtgHvMQTBF0M8bTJ kuiETWO4vnrUXekZ3/qEBE0NR5cP1fwPkLa9f6TiPriEYKLJVqeT8b0F7Sv4/tII4BJu AJFw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="ev+B1/7I"; spf=pass (google.com: domain of fm-1326448-202409050721387ebd7ad290a63c5bbc-rvl9hc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1326448-202409050721387ebd7ad290a63c5bbc-RVl9hc@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=1725520902; x=1726125702; 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=uut0yYQmz66y9BWLhQkcpshN2iBpucTSfFe4btWhXKE=; b=M0BLhuDUIMTiIk+I9xaX5vc4Bse9ZklQ50sPxPdrDjsZAxNB6DhhSPOsQ6XihRfvfR Dj3QZjclDT1bAdQCYqqepT5gYBcWDmsso0EL0KCNWnvq878ThW6gzSgfU9yNEzH4v3+X YZ+rVtjcR10c9n+JjB/Nb+yq2HLrKvlFn/8Yi0AsX3Xg4W2JLDpy0mcwjzCoWxKpQpIa /DlZT/5bF8pL1Z/0ZRYFu+56tLIGMu3lrmbrGXBAKjEIi4G05mIboNV49NBPT/aZLTXp 9fy7xv2S4oBXKLG8AliTCRqrnGj6IHzE3oR3RjK2GVSkDSSMrGRMmXJcfUXnrCq4eeom RjKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725520902; x=1726125702; 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=uut0yYQmz66y9BWLhQkcpshN2iBpucTSfFe4btWhXKE=; b=mmOVtdb1ryK8KtaCoSh8Cx6GuiWDnj89GyDSJuXNrdLpM7P3xtSeAMuikenNpimCRq W8R0rJGxg4yd8uhkNDu1zFo3HmsgHVksMgF5ARie6gg0guk/qOr5aqdHA28ifekiDdXl LweTRb/+fnnHDO4e6LhTls9i6pWaO3jh6rSovJy7aX5hQjB1MXYdekdOhd0PDuCjKnVD 3EOeE1N/C6/zh4/QhUBLS5zOFJ87BRF6+RIsjrZ7+D3K38KFCmkqLcxW/wrJ6/zEd+2u 3uihUCsPHAPWeASZraNeMD31w4yWlIE7JN+q7gwEknE8A9KtpSYveQenMkCIqGadWA39 28gA== X-Forwarded-Encrypted: i=2; AJvYcCVezY9OKML5OspumPzOIsDZggAFf1KHAegtVzD0sFnOfuYGj9XU7+UsMGbTVDlel0DkERQAdt0=@isar-build.org X-Gm-Message-State: AOJu0YwGLHLjt4xz+37T4JrLtzLl4B2/3UR5erMib/ycaNkldFaK4ory c5yHRlyNKZUgw0QdQv1ZMjazkZb6+jTUN9k/GTFDk7KLXnFoT/5F X-Google-Smtp-Source: AGHT+IE30lans8WmP/xC7aLmcd5NZvJZ6Y5Z1cCuSrD0I/bhXAbBJH9EZHqeBLivPV0+Icd6/dD2Dw== X-Received: by 2002:a05:6830:6781:b0:70a:9885:f9d6 with SMTP id 46e09a7af769-710b65e0bdbmr2686542a34.15.1725520901524; Thu, 05 Sep 2024 00:21:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:e719:0:b0:5dc:b16e:e619 with SMTP id 006d021491bc7-5e197212e69ls53238eaf.0.-pod-prod-00-us; Thu, 05 Sep 2024 00:21:40 -0700 (PDT) X-Received: by 2002:a05:6808:2387:b0:3de:62b4:9a47 with SMTP id 5614622812f47-3e01349ed2emr2196296b6e.21.1725520900682; Thu, 05 Sep 2024 00:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725520900; cv=none; d=google.com; s=arc-20240605; b=FGj8y1IdUeOWqwva4T7JxjapRNR9cNHG8tWe9zu7mYHV1n2DDxe4uacfbrSSP5G1YY LfSUYdHC0B5fSZiiMEMdBHhMN8Bbtg0Q2PCdjQxNSTUbUSnIjJ7WdZgvNo+1iHEs9DUr o2b/V04O2omDh7WgGwZ/Ex9g2CI6rgqgbZ7Swe/QBvFyI5keutWBKwntRaIaDZ+qkET1 Jhc5SVHA2VAhO9cVxwni19Id8cj5mtWH7fev7EQKRuQ1bRfyP4AJ6SbSU1uEf+lwfpX8 ZAC7pT1C9Tw5sHizAZWFxJ5sc/RnOy5lNs2Xa6tzAi/Zc+EZHcK1FqfgC2gToy+ta8r8 aB1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=DxgPcq6+zm4P421PqwfCOyWe2h294hQsC38lIrLP2PY=; fh=cSv2H02vVfo85sMV2xOoCfqDxR8qzxE6ZGdxprm5KA8=; b=k2/XCWXDYuf/7vf1QoGeCjg0rrz/00607xQhcoWUXmEM3r9GpJiR+Ejfm73N2+PqfZ ijfr+ZV+I9IWEO4JHTI+jZQqc4qOspaFxgantt74Ih2vIKCBV8apKQBkq2ddNWpPi+22 mUPkXx2f8Ss2M+VU4LygNLttRShWcodJbeIl3cNViQEvv1vdmw1F7xwhZbU7nZJ3uqUz lHcq5krqsKdY3eKCd6M7cvKdFU/CTR7X/LyhQ1SGkI1AaBCuaxpvGocnlQ6809w1jyLK ND6h4X6yTORqJ+8eMgi9oSU+/wWQMIh6loyWnarv/dy+ep/8IQ3pdHusj2oa59OGbPdj 7/EA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="ev+B1/7I"; spf=pass (google.com: domain of fm-1326448-202409050721387ebd7ad290a63c5bbc-rvl9hc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1326448-202409050721387ebd7ad290a63c5bbc-RVl9hc@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 006d021491bc7-5dfa0537a43si594097eaf.1.2024.09.05.00.21.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Sep 2024 00:21:40 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-202409050721387ebd7ad290a63c5bbc-rvl9hc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202409050721387ebd7ad290a63c5bbc for ; Thu, 05 Sep 2024 09:21:38 +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: Thu, 5 Sep 2024 09:21:14 +0200 Message-ID: <20240905072114.4838-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="ev+B1/7I"; spf=pass (google.com: domain of fm-1326448-202409050721387ebd7ad290a63c5bbc-rvl9hc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1326448-202409050721387ebd7ad290a63c5bbc-RVl9hc@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 Reviewed-by: Jan Kiszka --- .../expand-on-first-boot_1.5.bb | 14 +++++++++++++- 1 file changed, 13 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..ebb22c84 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,19 @@ 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 \