From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7358726115425255424 X-Received: by 2002:a05:600c:5246:b0:417:f6ce:3353 with SMTP id fc6-20020a05600c524600b00417f6ce3353mr10311625wmb.11.1713336937700; Tue, 16 Apr 2024 23:55:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4f0f:b0:418:41a8:c5f3 with SMTP id l15-20020a05600c4f0f00b0041841a8c5f3ls1029822wmq.2.-pod-prod-04-eu; Tue, 16 Apr 2024 23:55:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPY4yR4iEoExO8dIZ/381YlgzwwZuEK1C941oMKDdlh4/y9F1S59PoVMEyEiqOH3R2NFQP X-Received: by 2002:a05:600c:c2:b0:416:c63c:5f74 with SMTP id u2-20020a05600c00c200b00416c63c5f74mr11182151wmm.18.1713336935551; Tue, 16 Apr 2024 23:55:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713336935; cv=none; d=google.com; s=arc-20160816; b=guUfkZ0WUSzspOs9Kj+r3XTQQxe0B+mxa6Ffl525nzrZrh/fGipfYjLbLH04K8QEof hnR1m8yPt5TQ07SQEqa5FcT80xUI7XVpxCQYNfECKuL/hvhNrIOWIIZOe6uqK4mlLlXf YJLRZxWlh0sWVYFnvnGw0OeCtJklgvPmCZ/49H7oWshkDNpdR3l54QGBZ8jST9RARNry SusWUrK2WFmL6Skvzou24T0tJpdatuTUzU7J1RiLq2TNMC2n1hAvzzgC+wSUB4Rx9ziJ jkR2HYCzhXZcl6LANk36aguqA9eVKxUe9q71fV2JN8fpV6Ibk6oopEjDG7zGQWZuXWvO MiMg== 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:to:from:dkim-signature; bh=rY5PZmPzL2IR+c2c33yyGUzCSCLEtRwOWMiAp2dYU08=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=sclU9tTxOvgQGoNAVU2jDv0F4Q5CkRA3XHIZUzF7KG0BKoUDXuVOjVsvFT1xlwJSvC DmdihzS5tuF3QlS/ru8NU0ETrVZy/tkXoADjOIhIOS9kgm+esb4LF1ix9BFapPco+dD6 sPE/ISpdmPP5dv1D5YL0M/AkQYgt5f7rtt2ePS13fviiRGqfOJqBzmhoVfS1RJr8O4e2 6KTKwqznnVbF4CC9ZUyYHF3JsBzkz/8/NXxsLJOZ/PnZF3HOzVa4Hiwo5O4MxEEgdBHj q/3s+x60zAveFvbokiPyLrwilKwo07y/DUYmmPAg+n4HWAM9LbghkWenrO2ApdLXC5bh aaHw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=E4R9p3Px; spf=pass (google.com: domain of fm-51332-2024041706553409bdfc9879b09b3237-zryit7@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-51332-2024041706553409bdfc9879b09b3237-zRyiT7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: 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 p10-20020a05600c1d8a00b004169ae97a70si212894wms.0.2024.04.16.23.55.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2024 23:55:35 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-2024041706553409bdfc9879b09b3237-zryit7@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=E4R9p3Px; spf=pass (google.com: domain of fm-51332-2024041706553409bdfc9879b09b3237-zryit7@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-51332-2024041706553409bdfc9879b09b3237-zRyiT7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2024041706553409bdfc9879b09b3237 for ; Wed, 17 Apr 2024 08:55:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=rY5PZmPzL2IR+c2c33yyGUzCSCLEtRwOWMiAp2dYU08=; b=E4R9p3PxGH43r5AKmtCxHtaXBRJNk4oa9+ltg1Fs3IsRua3HaK21brTOBvuSrSY9wynfs5 uG1IsyJxSHhZrLF1H0bOax0zqdg0TLDXFMS1wVUFzhvQjLuYZtcrgc8eLb8m4DedrRUfbj78 Y1vH+Tq35mhNsuWycqA6ft8Ckf56g=; From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [PATCH] expand-on-first-boot: search until no device mapper is used Date: Wed, 17 Apr 2024 08:55:18 +0200 Message-ID: <20240417065534.1678488-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: trR2/0UM8Vu0 From: Quirin Gylstorff Device mapper block devices can be stacked e.g. in case a hard disk is encrypted and uses lvm: sda +-sda1 259:3 0 2G 0 part +-sda1_crypt 253:0 0 2G 0 crypt +-debian--vg-root 253:1 0 1G 0 lvm So we should traverse the `slaves` until we reach the endpoint. Signed-off-by: Quirin Gylstorff --- .../expand-on-first-boot/files/expand-last-partition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh index 84f1219f..0cb2ee21 100755 --- a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh +++ b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh @@ -12,6 +12,9 @@ set -e ROOT_DEV="$(findmnt / -o source -n)" ROOT_DEV_NAME=${ROOT_DEV##*/} ROOT_DEV_SLAVE=$(find /sys/block/"${ROOT_DEV_NAME}"/slaves -mindepth 1 -print -quit 2>/dev/null || true) +while [ -d "${ROOT_DEV_SLAVE}/slaves" ]; do + ROOT_DEV_SLAVE=$(find "${ROOT_DEV_SLAVE}"/slaves -mindepth 1 -print -quit 2>/dev/null || true) +done if [ -n "${ROOT_DEV_SLAVE}" ]; then ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/} fi -- 2.43.0