From patchwork Tue Jul 2 13:38:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3645 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Jul 2024 15:38:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcfks029418 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:42 +0200 Received: by mail-wm1-f57.google.com with SMTP id 5b1f17b1804b1-42566fb83c5sf7140905e9.2 for ; Tue, 02 Jul 2024 06:38:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=Ybe5GYsRhEh4kGvE0NHC0/5+cZiq1aLqS42mootGvV52Th3gdd4sMTA0gD3+I5lWXe EOo9MUIck6JlvMBUqRTdL0JK27lX8tkTLJ87T6a++tJlT8TG/ydCGmXdU7hGyvCRXnT8 ZJnIjFouuGy6rmiK0Ko45wl6hpi7VAOBjySTq0HeOTV8LjEO3BWdqWL+YDUjo1VmtZWY /ent1xISEwVBuQBpmVBVqnBknmh/c5JLjk9/rNigMxtwl/LOQm8WA914CmTHCNFntyXs gQeioRRNP5uvx20FJBGDD9yuzuikmJiMt22B+5tcYExcjX0pEU+yoWKVGJwjyDGzHjqi +tUQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XfnKmDuPpCim1Hc+Fq5FVD0B/pdiBieMKocyS6xE9n8=; fh=kztVJEL6Po79OXyW5xoDUjIKRNcLFgaOO7Vc1Wpc5yU=; b=xY9fWPGiw1EwLvsBTEqsC5sdX1S6PGomDX+fVzJfPygqm5VrCuSLURSecajzedypHb /F7Is++9W5zSzr+okb4esH3jZ9Z/1M3YlmEYYIUC0N164lfWy8kOcJNWQuYw0jKIHc8+ rseFbdPi2ijpH2k91vKzugs+0KPCHzb6Y07DTntTKzjnfYI4nFH99IvIBYTllmnnB6nt DDxwTD3Fu7ejiGpA2ol3k6FFCodafsiKRdL9JlBwzJP39ZPz1HUimdgC5p/tRulRi72S 4fYOUf8sJ6RdXKqoBEaMi+g/SFZ6n9WASFp+ofFomqDSQ8ea+hDpJdfbA2Gnq7UVYxgb gZTw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=NEat2Ckt; spf=pass (google.com: domain of fm-294854-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832c8b1c19ac4189077d8-EHcdzl@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=1719927515; x=1720532315; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=XfnKmDuPpCim1Hc+Fq5FVD0B/pdiBieMKocyS6xE9n8=; b=MSFHPSw4K7H/1EcqgKcwF6PtnZXvLiFPI7Naah/MQBaIg1/QmKLvk0PcDY3/yDrdOI Q+4+ba/TevewP13LyKlJuU2AzBbn9LXL6EhdSLzP9IBbch7B1fOZoHLYbwzEJLGxNb38 RRhQiYo7IBP2k34sn88yK/X7oX5RyNkjGqan2ZQNKMLZHfdXr1UiBkhwzS65W83B1atb kmfDjv/xR9Ls6Q6aQMQ9pY8mRlEKROjSZJ1EKvAlkbjUU4G7a9ii0yLqLYwgTV7MgSXJ JMVeODEUnbPTtl1udL7datZ7MVKPJGGsd9I7Bck41Ll/CrC8TCgdkGVe8LtfFBMJhcnO yWTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XfnKmDuPpCim1Hc+Fq5FVD0B/pdiBieMKocyS6xE9n8=; b=L6G7hNIkSutXKrbNQx1rIPZt1Yf9yffpF3yvdIhmkR1/J+/KBfpTi6VkG0/h85BZGC RtdoQRH8pmIdGL5JQH7XCHdlj/doq0Yh1wW9XEGmwaBvKT+AllxlcG4HlE94n0H7GlNa gz67U6HM3biCsnKKi+/dcNl0Yv8jPpPeTfH0/iInyxbvLlvmECheO7K7fWJrX768CcgX F8UYMlM9pNDPOklswc412Qty4O0EbpP9OxBEXIC205PKFiTqj9k/+uzzjd8+VyghXVg7 WpotMngcJ3MdV91Tmheb64w0fYivO8/FNaPAgoWcQIZHukeb7QDPmfo9x4XCPwOZKkHX 75HQ== X-Forwarded-Encrypted: i=2; AJvYcCW920B9JJRNHEt7yQV4fhxJJ+ii6SHBAsPlCdOwI7qV0rGJJRjnxR+HQLEPvNpDoMkplT11rtVK9xiiRWavNZMFDu3eWRI= X-Gm-Message-State: AOJu0YxNhg4lW+B41xk00csykQYO2h65CWk+4rDOVTuhQX5ZnaNfNxo5 6nLJAs0klxcn/TBY9Gu39oNKxQuPlgrP0nz2iLh74C261dBUAKgK X-Google-Smtp-Source: AGHT+IF+N9Uxijf7ktMPjJPuy629xy5zTGwJ2qDrN4ExEtpOWsxWBrbmf4DgbfSuWWb5eSKzjaHIZA== X-Received: by 2002:a05:600c:3ba6:b0:425:787d:b36a with SMTP id 5b1f17b1804b1-4257a02f9d0mr59001045e9.1.1719927515082; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b8b:b0:422:27b5:8466 with SMTP id 5b1f17b1804b1-4256bbeee32ls18967875e9.2.-pod-prod-01-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:4a16:b0:424:a779:b5c1 with SMTP id 5b1f17b1804b1-4257a0114a9mr60628465e9.20.1719927513149; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927513; cv=none; d=google.com; s=arc-20160816; b=fSg2DgRFQEYDIPkskle/UfDiPYLLiHMKpm4u3pfbESzF8x61n6JYBFyOdjrgNNgeFf zSJMs2vlSt4Hx5T0JQj0g1JZguTXmuqGGnzIpL3y0D5V/S5hxJOKIQ9q7qDU2xPNoNth CrUDT8QcRxIFsymeBI5sapv+1ehfCgrTQ0Y6eMRljgCtTbkq60ejg9lwTaBeWLUCuZWS 5H9zY2faB3izARddeLYjEQTGEHa2eLEX0tYwigCvwR96CTnDtOC5sAS7d5XkeJMZGTO7 R/IojnApGCBO3k/DKkIim5SHGM5YJ44lLUcVWpdaLRtNBSL+XdD6hNOBjwbKykNgXcPc 8BLw== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=N6rtmPrsZxrfLE9amlZGrYaXNofOOYQAx5doA8DG4ns=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=xf4LV3z7/kwXY4EpTStRA5H+UoBQTp+LwkSy4eFWILAPJDzkOB9xmzFBA6jw0hrJqT Fqy4O4kzhmyZZK+igB2HXi3/M1jeZcF6jdM9HO2i+koZe4L8tw9LDirXbDYdrir0EH9D WlUOb6zRXJCMwSAEqcEcThPgjISKcKNPxVnaZn1Ul4Yj+4sBxfYKzkj6nY3GtcQiX+zH Ky6Rx563J1RO7ES+jzAfFVIzBe3GQhO/63Vkyb4pvlnzrxf4PB67BYnOkx9Xw24hA5dz cmJNCk18Wum6tyiX7ksZ+NfvebasUtA+BS9pKW35L5hHMiuloodwjQPXtD983V74imON zSnA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=NEat2Ckt; spf=pass (google.com: domain of fm-294854-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832c8b1c19ac4189077d8-EHcdzl@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42577a0deb0si4303495e9.0.2024.07.02.06.38.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:33 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240702133832c8b1c19ac4189077d8 for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 06/17] meta-isar: deploy-image: Improve root mountpoint discovery Date: Tue, 2 Jul 2024 15:38:20 +0200 Message-ID: <4f3c5e331c7d117a5066bb804e83b98a698427f6.1719927511.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=NEat2Ckt; spf=pass (google.com: domain of fm-294854-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832c8b1c19ac4189077d8-EHcdzl@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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_H2,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: Jan Kiszka The rootfs mountpoint may only appear as /dev/root in /proc/mounts. Therefore, reuse the pattern we have in expand-on-first-boot already and switch to findmnt. Signed-off-by: Jan Kiszka --- .../recipes-installer/deploy-image/files/deploy-image-wic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh index d27a0189..f73a48a9 100644 --- a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh @@ -25,7 +25,7 @@ DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") # inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh target_device_list="" -current_root_dev=$(grep "[[:blank:]]/[[:blank:]]" /proc/mounts | awk '{print $1}') +current_root_dev=$(readlink -f "$(findmnt / -o source -n)") current_root_dev=${current_root_dev#\/dev/} case $current_root_dev in mmcblk*)