From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 28 Aug 2024 13:47:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f59.google.com (mail-oa1-f59.google.com [209.85.160.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 47SBlf4e028623 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Aug 2024 13:47:42 +0200 Received: by mail-oa1-f59.google.com with SMTP id 586e51a60fabf-2703e353c5dsf9686007fac.0 for ; Wed, 28 Aug 2024 04:47:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1724845656; cv=pass; d=google.com; s=arc-20240605; b=hAf7z6f5NdwMi1Iq0/s7y05mqzSIEyf3vhVrL5/i81qKiHvKzvMn2dHs/lRvUojEU1 uCVqZUYMXlC2Dwn8qyfAHgN685RsPvk3ZB7HOPmQWtFXExgbJFGZm8WWEVJzvkU2N8wd GGD6ESeSjb915uo5c90W1yA1ED8UUOOtEVVmt90ogRw1KQsi+zcY8UHX8+rgW+WtW7RI S7ujORci0eQZTurT11o/vt+fnni9Ge02JydVt5SAz80m2ti++wx1naNFeJr5cUCO9ahv Q1+pvFLhQilTDCTBnDfx+EG7xRBroX+/0U7LJjw0sdUQOKUkg7VjGb1PGOfLSl/sbnl3 +Lpw== 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=41rmniGNdT9DybqJLv47EJ69QYUovpy4HZ/rWaDQEDY=; fh=vJgyEl1slFIBQHcIh/RzXpgBa5q1MRydrKGB/q+90Zc=; b=HDPy9csoXL02kevV90YmhZowG16uI7vtFBPRLvLcpm4Q9VnOvuQQiIp7vr2isHehow aAdvZMcqKMr2KzGq//rIiBon6NVXHwqoKEvBBp5ibkaaC0vagxwkx4jkBinB73S5NPXz tGvfGKY41GNM16xBGNrHL/Urn87BiqN+YvI8XsJB4Bc0/a8iniI2xjbAtfRq0TTloOEY wqSQ4Dv5xzmkT1/H5yCqb+z3po/oQzPK3CyxZiZpWiOJKflnSUAh/T9SH4QdFRvADk4N xbB3GPkTRbRNx7OWPxgkJDmKgDFB8cqhiueFJzHz+kt3NiEa8Lg5O/M+7plUjMHmsQeE Uk1w==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FNBNFC8c; spf=pass (google.com: domain of fm-1326448-202408281147332b675c6bf0a27ea4ec-pbaku7@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-202408281147332b675c6bf0a27ea4ec-PBaKu7@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=1724845656; x=1725450456; darn=ilbers.de; 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=41rmniGNdT9DybqJLv47EJ69QYUovpy4HZ/rWaDQEDY=; b=SeIJQ4hZHmonp1K7RZwU+fbtW2DdRN46il5KFqd3J3w56RhlvU471L8keKA2UT7jdE xlpvwoFcFyFSofCbMuBDSKKXgcbuN3nKuMuKcEvEk+d94Rm3cQFv6zvQ2Ye+XWf2CGtr xjCFLXgkXl4PrKWVqW1KERVMgXzzxXHwTsJONazaElpRwAM4CjEmsx5/z7A4hup0SPSj Vzf1d7QKJH9tMV15yLGzFLw+OCoRrPXdbjqdGF+Li/ZMHJ24UK1U38fS9xRWbWD2esFm frG8Eq8Zg/B57DI9Y7RJ4QKP/hz8dWdipT4EI7ostlllea4GuFJ5apmkJzJp1HWHvKPM JMGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724845656; x=1725450456; 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=41rmniGNdT9DybqJLv47EJ69QYUovpy4HZ/rWaDQEDY=; b=ZEW3CIMWShJ0XmsNQYOL/1QRiiLmb0JeeOanToNN0/g7UY6hD90p2Rb41wZ57etanK NZ1RlW2B0mV018GW+f7jz+IZLezjk72tNtmwDi7pCXCOX4Xtrm557J1GqYOK+1fnsqOz UKhShDrkUBMMFmAFzVAOg/hNuO3do90Pv5T59/Gb3kwuAUVfTOnEf1AvZfHKnwvHUAsY cge0el01c/tIRV5Zif3rVvhtd0jE/5ilrui7pEvb0cH8bE87hFBBWZdALPkZBR/rNX19 9+IFXzDQOvzUUEw9TPqrmvurOr+LA7gCmwk1J8tsqGx49Cr4HOOlziv6C+rrfe1ZJJqZ USaQ== X-Forwarded-Encrypted: i=2; AJvYcCWUYFeTdwEHMbsKvO9P2eaAn37pzJRteF9jecCSzQdPy/K+Tl+CBV7xR5yAW2+CSOsnJKXH@ilbers.de X-Gm-Message-State: AOJu0Yz5MTIsW84n8c6BfsMJZ4F+VocvenpzQImMLzTtlr7riGptCRcf iS31nmy2/wui1SaNmA5QROA/YHnzgeam9z+0vpJfWHTcOIjDi9sp X-Google-Smtp-Source: AGHT+IHJgY2eHx49WvE6nJp+Jb0jYaBtUwHBZMi+KDcvDRHvzguKmtd0wkgxA9wGV1o3jfJhr8E4jg== X-Received: by 2002:a05:6870:8993:b0:261:1f7d:cf71 with SMTP id 586e51a60fabf-273e66f528amr16770657fac.34.1724845655612; Wed, 28 Aug 2024 04:47:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:c0c:b0:25e:749:fb39 with SMTP id 586e51a60fabf-273ca78c040ls161715fac.1.-pod-prod-06-us; Wed, 28 Aug 2024 04:47:34 -0700 (PDT) X-Received: by 2002:a05:6870:8998:b0:250:756b:b1ed with SMTP id 586e51a60fabf-273e652d914mr18715712fac.19.1724845654558; Wed, 28 Aug 2024 04:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724845654; cv=none; d=google.com; s=arc-20160816; b=Y2Ur9Vj+vzFHp+5W4z4LqnZDvjN5HXR+9wo7kGPqazgqcTW5wQW8Omy6QEl6UQMWDS o7HwGjuHPbqWXu/pgHX8AXNm1VctAxrWgewbX5ikz9dVOmhcU6GUlq+N+vh6nqDM/n+v ACYzWLHHdWqZxi7iw2rNHLPHxtKnM1+4LJNdQdYo4QJUnVVPZnYsUd5y7kdv1zRKfLTV O4OeznyFKMZuYNTK4Hog76TVq6wt50Wl0ALoVzTBAmhbeUpz3JxZWEJRaKKuyxrVK1wI tRzeU8YncUB6mv6sbMCAvxyY66IOZCrWwZAsMu9EU2BhWKjgaV8j3T7aOiaWvC3/5PVI /sLA== 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:cc:to:from:dkim-signature; bh=gsorNorZLOmfV2CY7WjAjoaXJJEeplE8oXZVG31NaAE=; fh=PpWIame8u++O2AKYmz4eO2eLtEDNXbj/8l0CiINKMR8=; b=wUBxRLQYljNDlCJXREUfEd+dd3TwVt6FohEGqBMPFlQKLgl/HeIm7twOXAbumuGrLM tSQetibyXv0BLCLQez8VK+kdFPaZZYnzAI4d87nJh8ncc/bNUqtCbGTgInmQgCZSB1C3 3UqRE9Ytvrf4/XYroDm1PAOQ1YXM20ZfvWJMLsxYbCbUjQgs33C+6tcJS2VHBmRe9p9c w7+qOz7g7CtEJngTih3Tg76EiRwVXShABWsMFFfwOXogq+1dr2q1RfZuqcXQQMg7S26X 22mKuvjK1AttBNTLvTJifHreqsfi5sMlD6Zj1eR7SVla6nJbUqTAD2jRTR7iPkxXCY5p fwLQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FNBNFC8c; spf=pass (google.com: domain of fm-1326448-202408281147332b675c6bf0a27ea4ec-pbaku7@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-202408281147332b675c6bf0a27ea4ec-PBaKu7@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 af79cd13be357-7a7faf0a9b4si1569685a.2.2024.08.28.04.47.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Aug 2024 04:47:34 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-202408281147332b675c6bf0a27ea4ec-pbaku7@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 202408281147332b675c6bf0a27ea4ec for ; Wed, 28 Aug 2024 13:47:33 +0200 From: "alexander.heinisch via isar-users" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Alexander Heinisch Subject: [PATCH] meta-isar: Added support for nfs based rootfs in deploy-image-wic (isar-image-installer). Date: Wed, 28 Aug 2024 13:46:15 +0200 Message-ID: <20240828114615.123711-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=FNBNFC8c; spf=pass (google.com: domain of fm-1326448-202408281147332b675c6bf0a27ea4ec-pbaku7@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-202408281147332b675c6bf0a27ea4ec-PBaKu7@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 Content-Type: text/plain; charset="UTF-8" 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-TUID: SItRrvkoH43B From: Alexander Heinisch When AUTO_INSTALL is not used, the script tries to resolve possible target devices to install the wic image to. To not overwrite the device hosting the current root we are using, it tries to detect the current root. Which works fine when a local device is used but does not work in the case of nfs. (most probably it won't work for cifs as well) With this patch we are detecting nfs based mounts of / before the local device tailored handling is applied and bypass the breaking parts (in this particular case readlink). Thus, in case of an nfs the current root device will be "nfs". Signed-off-by: Alexander Heinisch --- .../deploy-image/files/deploy-image-wic.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 8b25b1d2..95188fe3 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 @@ -47,8 +47,14 @@ DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") if ! $AUTO_INSTALL; then target_device_list="" - current_root_dev=$(readlink -f "$(findmnt / -o source -n)") - current_root_dev=${current_root_dev#\/dev/} + current_root_dev_type=$(findmnt / -o fstype -n) + if [ ${current_root_dev_type} = "nfs" ]; then + current_root_dev="nfs" + else + current_root_dev=$(readlink -f "$(findmnt / -o source -n)") + current_root_dev=${current_root_dev#\/dev/} + fi + case $current_root_dev in mmcblk*) ;; -- 2.43.0 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240828114615.123711-1-alexander.heinisch%40siemens.com.