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:21:17 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f56.google.com (mail-qv1-f56.google.com [209.85.219.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 47SBLFSD028410 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Aug 2024 13:21:16 +0200 Received: by mail-qv1-f56.google.com with SMTP id 6a1803df08f44-6c32c044aa6sf26080376d6.0 for ; Wed, 28 Aug 2024 04:21:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1724844070; cv=pass; d=google.com; s=arc-20240605; b=DQTMFav/h8vxcDVtREY/24HZi3kSRmlm7nnNpu3b9yd6q+zS99nkGV7L1/NWM2iHDF lKLKbN/0gvKM0cWEHbwVsw42JQbrLQ8IviOe0dyjCf4tlR0n7ePn4MLWEmcdkUIobk0h +g/DYDN6vz/X+mIVLsD6tA3TwWiHqXTMQkkhVrisp7ZZs9v4Ex2yu1tLbagbGnAW0vrY cSKWkumjHgiQvzYS6P6dXyv9Esaa1wzi+DaMtFy/Y/3Vj/0FBeYgtHpnXbKapXc+03cL 4uA38+8E6rqBxkkeTvMIjNJ0SbS847A8TKKy4a8T4MRDLkYeFtQf/mP5dnnDs1baN7Mi PRlA== 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=0aZKa+MIVFfZYPHK00OEtc92B8wXpQtoi8rTl7xK7QE=; fh=0dlPFyaiz+wzIhvhTwOQlIIcjQuF8yYgnvtogjUEchU=; b=h1w2OvubFitEVeUUfXfsBNu4AWaQ5HQN3VxZBzE1t2tslHSO/9CSPVeCQlScS4vJBO 10+tDNgc4iXnMLUGXB6pwPT6w0nF1Rnnpi4xmBueg0lYUZFxa+Uunlf2QJ9tXOZ9XoNe z0/cMKNspuw6BL7eOheKuMDN9Kw+nDk9vqKnj+bvUYjjmj+wElBxkYlEMj2QuC5Gbixg OJTRSaA/QVq8BMBOvyHDDxW0TQUpiLhdMC89+A66bRRPr8Ddipj8rj6v4aidW2859Jec e2cR2v8+/+7gsVsSXgUqCgjz0b6VauBKObSLf26Sg1C7WqZqSBecCINAqkes6N9HFpBj 481g==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=K77BxwnZ; spf=pass (google.com: domain of fm-1326448-20240828112107e24b9e38df874212b6-tjpazo@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1326448-20240828112107e24b9e38df874212b6-TJpAZO@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=1724844070; x=1725448870; 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=0aZKa+MIVFfZYPHK00OEtc92B8wXpQtoi8rTl7xK7QE=; b=saqz/qWQJvPU4r9XtXrw6WwWqRS8vRqokHNq2yvMXf4yi6EvW1orqF0unfRQ3TYKzq ObAX4a0tJWMn40XGygOkHBoOYYXVPcWgJXKzXo0CONxhIXv0BdFZdTp9tFfx8cOVdL4d dIdBO0iRzmAN8zxk4PaTRqg/kPx8KY1fuW7WucF6oAZleO918ny65cDSI6gLnLNVR4gI dPr36m6ZaEMfv1n3nOzJE+Pxkp0lqwAvIbN8QqKBLzLcODCxe0upoR4OR7m+ac2Ll65l lDRwGy73RHPm1C3Ypf34kBiicJpr24caKMWXIWSTho6TE3Ywafirmbl9ld7aUaszLbxW /n1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724844070; x=1725448870; 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=0aZKa+MIVFfZYPHK00OEtc92B8wXpQtoi8rTl7xK7QE=; b=cJruVSmevcNPd8uYcgSnIAUGz9AmZLJZbyAaXi6Z3EFxSyuSNemxnBXtLUSNJ9Qvyn ywmuZOb2pl64xvbawdcUhqT/vuraJIZ5Fi9prc52UjaIEGI1wBTDlYSPl0Bh5r3OEQtg A7Gil0q2dEm17/268da5M1+fFCIIUqHOnQTO+/kg9Kon4FIA0JNKdoMMg3Oq7kJ5MddC hqLZa/I9G9v+vQ2TU0lAOHGfyUTIfxDpkEyOr8r6B9ehWTxY9OsKp3bL8y1svszGYXTL ikcZNag4ELEYiLa7vUaX7TlFYuYmYiZqr6xVj54Th7sar3swqDLDBsZJYamRaKGpnh43 yYRg== X-Forwarded-Encrypted: i=2; AJvYcCV2Z+5nTxxigczfKCzQuYkTrUTlF3rB0FXHDE+jitClBrRiG1zfuxK3TWGiIbBjka+hjIu7@ilbers.de X-Gm-Message-State: AOJu0Yw54u503FmlSvn3ZeX5ULSPR7oPTYNzahn9Jp6Ki/Uj+d66P9AV p9MP1QMOEma15ljB9S/A1ob7HWwV6ReQMeg3oVzbgIqzkZQlg09j X-Google-Smtp-Source: AGHT+IGfTzN8grRZF7O9esIeUuiLOcywSeoW1noEy2MDSv4CcNjoEgzZSans9yxKtC2uHu1kiU7EfQ== X-Received: by 2002:a05:6214:2b97:b0:6bf:96aa:9891 with SMTP id 6a1803df08f44-6c33633785amr15401956d6.37.1724844070165; Wed, 28 Aug 2024 04:21:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:e4a:b0:6b5:a3b:a77 with SMTP id 6a1803df08f44-6c16130d824ls90140196d6.0.-pod-prod-09-us; Wed, 28 Aug 2024 04:21:09 -0700 (PDT) X-Received: by 2002:a05:6122:3b15:b0:4fc:edb4:3386 with SMTP id 71dfb90a1353d-4fef0f1837bmr1614845e0c.6.1724844069200; Wed, 28 Aug 2024 04:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724844069; cv=none; d=google.com; s=arc-20160816; b=s4V2yraF4znz6suxIiSBXybrdlRYvqaRtB6Gh+MDqynPwK/bdVatcJUJBXb6CIyuC6 WBgbuz4lJ8cVBIvsww5suqz/dXcGrxlhVB4rdedRQOLCrc5EnPvRfVbi7/OgDJVAnFZE SRtHxQZyNU5eNo60HIwdwfpbUZ64sBkED3iNWMxYjIlPUbgj/BiI5VqtID0DRWp+MP9Z vnBqcvjrNANFlau/d7e8dPDB7KSWTOtURKyNoX6UkuqqIxzC5aBHX/F7I8q3TJboWiw1 Hw3iHA8do6DIrAaWuxkXkWffKTvWGSb7SATagEjAARTR5W/JXK4Li0votIO3hhXMwb86 7/vQ== 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=YTyreQGZe2KdUrt8t2uBzC+cnFSId9SDtL5b4BDsaok=; fh=PpWIame8u++O2AKYmz4eO2eLtEDNXbj/8l0CiINKMR8=; b=miAO58Avo7MGJXE9b/zrzEz6lpS+hwtEnP8b+acFHuUO9hPcNmLRrzwzM3Vf+wPzCE 9FJnYmkmpr8SlkxL6Zft0ny/D6dtneYLcy8ZaDkPSwxutlL1g3dXeX3/2mmxK9mI4Njj e3MO5Ld3vUVIj3jkee6ECo39r+iV/Sp2yoP5dJuFho6lZWNoJc1Z+gLVc9BjEB+Vk2Fq 7qxjyCCs+t2hRlBipVbTOPVlIlyEHgxHxkYx81Ih7VjgqCqVN7gbia1g2GnmkoORIs94 OsS28AEAAhhL1325LNu/eibZka96ehxZhjnAMdouzRvwrS6/mKF7L/liCdys3HLBcLYO oNMA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=K77BxwnZ; spf=pass (google.com: domain of fm-1326448-20240828112107e24b9e38df874212b6-tjpazo@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1326448-20240828112107e24b9e38df874212b6-TJpAZO@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 71dfb90a1353d-4fd08369aa2si245133e0c.3.2024.08.28.04.21.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Aug 2024 04:21:08 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-20240828112107e24b9e38df874212b6-tjpazo@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240828112107e24b9e38df874212b6 for ; Wed, 28 Aug 2024 13:21:07 +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:19:46 +0200 Message-ID: <20240828111946.112454-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=K77BxwnZ; spf=pass (google.com: domain of fm-1326448-20240828112107e24b9e38df874212b6-tjpazo@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-1326448-20240828112107e24b9e38df874212b6-TJpAZO@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_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-TUID: 9BrCWT43fVsk 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 | 11 +++++++++-- 1 file changed, 9 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..f8ce1d27 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,15 @@ 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=$(findmnt / -o source -n) + 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 "${current_root_dev}") + 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/20240828111946.112454-1-alexander.heinisch%40siemens.com.