From patchwork Wed Apr 17 06:55:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3495 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Apr 2024 08:55:44 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f186.google.com (mail-lj1-f186.google.com [209.85.208.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 43H6thmr026727 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Apr 2024 08:55:44 +0200 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-2d871ee2f2csf10902071fa.0 for ; Tue, 16 Apr 2024 23:55:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713336938; cv=pass; d=google.com; s=arc-20160816; b=YYT2PG0o4EZly76DwxCbqwiTU2Nl6LPIG+uDbuE0ATTptgY/IStkUfrHaDBccnJ9Cd iDB+BKj8MIk5XJ/bDclaqqSSRGgRwdgPQMF5MtuyhRT/c2SrjrrnuY1FnqUowvRWQAW1 1dZS7hbBVadXBkAeK4V3PQeofxu6dF9V+e4rFi2U9P08ZYo2UMsRcsoLBtT564b7z2A9 onQsopW4ai6Lh8IkNyqqI6+n/nPPEJxKDmQVPPXHd5+7ASvVjttYCJybh9ExwtXv5GQy j/pCCZNWRsgf0YZkMd6V3NYKwaDij7KvtI/dj40yhaCH+m3XjFfX6B4TI+YlnreWnwre 4m2w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:to:from:dkim-signature; bh=ULXcLDlFTHJ77rCbQmmKfHNTiRcjiVDChwZuWWDw6zM=; fh=KlxPQ1yeaPQ2Ox48a7XPoVwT58W85NGWN1JQVI5sE8g=; b=DJCIJzBQh1th8OfZH4bUgz3yl1uyCtWUnlkeoqPblwU5+rievfN9IdXWUJ4UFnnG5Y pBxxtfumsBmXSMgcl6m09ebA/h9NntdPR9UfymA8JywZMpTHU7Lb2dfDu2tfJC1Yde85 XcKF+b3NJ7rEWQwmQrR0e6rqjxgYYsxH18xfuYwgVD1N2yMVUaI1eQaKXADQG0Cq+4qJ CX3GTyL+qQeWauBTdlkIrUyD3QYz7N+T2q6/9ExcDqmc77WlKPDRjpQzDEfwn0ZNQnJH vgLM8WjjEhe+EvjhBVCiQFjG7n3X4GnLzVyhpRy5EORKGqnwuuyyyz8i16A65VWDoxrl V15g==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1713336938; x=1713941738; 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:to:from:from:to:cc:subject :date:message-id:reply-to; bh=ULXcLDlFTHJ77rCbQmmKfHNTiRcjiVDChwZuWWDw6zM=; b=L/nPK9Wl9EW9/9HEp9Ij+ZD1HSiiJPoAJ9IYcjPSSmusdlcPoNz3Jx8AaXHfyeZBJV bFf7QeJI7LlPx/x1IVWYqhHC7xKlIFb+UITG2/Fv+zuTso4VeE6W9gMwBKV3OZelAiQP za9aU4tYlW0Q73X++knQZneTEaR1s9MPHBXK6Oyqi190ifJ+9bfqRkRBd+Frp+E3NmSJ ttT+sp3UaeHm/pnTbV6xLe505fkaxcV9E+rSHvwfOzVLC5uqS6V+o/viUTzfFNbNpDYL ByA8At4GYGySlvPH3KAJIIauej0Hxed7Eoiq2rSiK+QnO79ErK+udj9yonqUwnQdwhDF VjkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713336938; x=1713941738; 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:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ULXcLDlFTHJ77rCbQmmKfHNTiRcjiVDChwZuWWDw6zM=; b=MH9sknc07QxMxNBxr0NDc6JcePd0fo7FWlcY9Ygwa4GZk14ZC/9++ACu4qML/xGWcj ndJpKHSagOfOvihTQxdF7Qd7024XSOZwZ27Y7AQu7FaOIh56iVyDZQQGPvWrVf4IlJ5/ 09hRyc4MQJxarfzEWQmlF66rQyI4lHrOWzUbVK4l8TJ39R8NyJs1itYjpc61yUztAx3m 4S7ypBqMPmQUvPmmsaFNwN7SGdsRZIAN5xnqjwdZVHOAPC5qkSyjf9VyPqtr20r8ueVo 6BilDl0HQWmU8y+4+mqMXpapzo5qK0wnPzxvrYB7vW/XKwvVFY/7w76kJoe/DnmXjt0q 6mFQ== X-Forwarded-Encrypted: i=2; AJvYcCXQlElLKzDwZUsCSTd2v1SGJTb2iGWSp9cBQoIajBqGBR3qX79DWhr4FSAW91UV1qmxcWCWMe8mmtWpCo2mCyY37rPC4Zw= X-Gm-Message-State: AOJu0YwJxlrQyZMc9VaP4iHD7tLnOQhxBMmPGi07uJ/Y3/YnV3+zmfzY /ji77OQWPZ8tj+cRT4D616dVTesj4HfOSgfs5+HWHdX9Wb8F3uIT X-Google-Smtp-Source: AGHT+IFkNJRXul02ZH9PebXwTorJfLTdk60z9u8R7bIo9yzg8KBqVRI+pUGs810pH0aVEKjQxCOXOQ== X-Received: by 2002:a05:651c:3dd:b0:2da:b4f7:f30b with SMTP id f29-20020a05651c03dd00b002dab4f7f30bmr3263901ljp.2.1713336937545; 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-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 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; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2024041706553409bdfc9879b09b3237 for ; Wed, 17 Apr 2024 08:55:35 +0200 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-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 X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff 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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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: 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