From patchwork Wed Aug 28 11:46:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 3775 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:42 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f56.google.com (mail-oo1-f56.google.com [209.85.161.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 47SBlfFR028621 (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-oo1-f56.google.com with SMTP id 006d021491bc7-5daa0b834d2sf6974970eaf.1 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=I45e+hrlivTWvjDV+huDt11RPnkfAuz0TNaZmcQExakX5K9xj7PDAP19cu0ju1Lgs3 ENGrCvMkqBsvAswRFWkurKYy6E74xT9m6WmMCOLiLLxQlaAL0ieTNiIs+mxHMlUs1B3O llKOWo9FFcXlGusj6U4dMMLtr4ccvB7cC1WdbuoPrWE34fczM1O7DptUTuQSb00BPIBF mI0PPrQWyqvvgkuoXiRoemRGgGYeOkPnk3RTaWSWAQ5ztiUh+KJJX1+/4TztffXRew7O 1h6wcNvrQdoPwOTJ3oJvsNhcPgCUypbdAOvUerRgsC9cyQQ6Fnmfl8AyKkwP+VfkVvkq TOEQ== 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=Y4febb9oCh15SL+oNjQVkcSpXMq/AJw2FMWxlbt+ltc=; b=HKImtAOkBbIO6Cd8m9jUPentyHF1QNKmwJcG/f3R568gBOj0ctHWPZdS5h7IxtBYRf tq6Zf1/NEhk4czHlhpk5xjL/ywynZP03gN/T1snNO4RihYHED5SZkih+9PkSssijoYd7 zC2UKO262QcOO2aoWOG3ogm/bQQOM1GBo7CMXRsbmNnwofHk3ktNPlkJUXc51CVqhxvV p7lkPBY749H19RT3pyWiI4HElhPEOCH1eZGjMHhsPNH5a7/FGMamjef1BNnffo9UV3kL yFoIc4UDIIZeVtuXFdT1SIqfC71e3VY0OksbrIRHDWhYtQCeAvScUHaQczRS4f9YyLnW oakg==; darn=isar-build.org 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=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:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=41rmniGNdT9DybqJLv47EJ69QYUovpy4HZ/rWaDQEDY=; b=Ra2qbX/bOB9wpYJQz5nqlmdqvt08F2x+bvzci0jtSUAhVMti64Pl0JygKkbaqLFeTp h7w8wcvzw8tu3FnOL+TAedjEn+M/WZhEdMpqz7+mwkvyNfVFKUt48ABAkJG5O3Z9xmSp N5eZZ3gtTbltk/5EaXwxDeQ9wmjSVTZcGnheju1iq7n8p+7R5I9Qn+u5lHZnG8w1jIAL PjIjwuNygkjzfUPudG/1WPXGFNppCAsbk104z8gQ8c2SV/WL2RxoCSM+6bcea5xa8ou3 md4TGgcDtOBh0+UcPgBbrgj6WFGJTJMUJKhRk6xqxzBLDrv6kaZFmzr/GgQJJ5EX25vO 3beQ== 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=WuVJnGx6a8NewQkkPIdwmN4eADCDGE9SyfJddyDDIg8GKCPYpFdoABAqzg5PyFia0S x5SvGeBp1TdlQS302zG7WBKG3cG+wEwcuopzzW+/uSPEh93D/KrifT1cmhT0BJgo52uo rnCWtyK19N9doVF2hIlpjceiYTwLGrrrBpvLgIOOGShpGGtFsoo0M0eLTPbrlA/Ydnkx jMAb+7wCQnTNz4J2Qodh5Mft40PT5f+PIVqwa9bowgNskrLt+FGDvEfkEWLhIw7bO4SS QyNVefFy+7JmPjKxlzdGTxfQwUWgrc+NGgd/naFozr9aolhcRf7jKs0uYMPBJgIiHg60 9dCw== X-Forwarded-Encrypted: i=2; AJvYcCVSkYx75Is04S/qfZX5iXr1tuSfdbvPPPxOIUTX4qNtd3qdxxiCb7FtUX2BVOk2TyFBm8DVRDM=@isar-build.org X-Gm-Message-State: AOJu0YzgubcRWlV8C4cQ6H2nx24YHitjrYQEVsVN6hQNN6tSdbNTwx5u VkWgGtfrPFEJz36b7Py1241mpXk/gLErKfwMCNSD4RGqnm2P5toz 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 X-Patchwork-Original-From: "alexander.heinisch via isar-users" From: "alexander.heinisch" 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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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*) ;;