From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:6512:3e09:b0:52c:e3ae:2737 with SMTP id 2adb3069b0e04-52e8273af60mr4941034e87.68.1719927515187; 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-Google-Smtp-Source: AGHT+IG0zrm/JKlU+5g1HlP0UtGn/JSGeux3I0nKjZcXmSYzS3mbX6155xze3iXtvWSESit2i0NX 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 Return-Path: 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; 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 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240702133832c8b1c19ac4189077d8 for ; Tue, 02 Jul 2024 15:38:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=N6rtmPrsZxrfLE9amlZGrYaXNofOOYQAx5doA8DG4ns=; b=NEat2CktbV2LJOaF4L0XPHY97xBnrapDW+E7mg4ZguPTH0nk1tGhUs2Ln6sfhV7oq7wkkY ez8AzIxng7YWL3LZ7SIxXz2u5QrzRsS23HJke5Y5zwy5sicahht/yuGTQogBNfTuwyYHy9MH NyE8rDLCgnMbTdeiIV6bkHQyAcvWQ=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: tkIs8+QaI8sp 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*) -- 2.43.0