From patchwork Thu Nov 20 04:22:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi Shekar X-Patchwork-Id: 4613 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 20 Nov 2025 05:22:41 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f58.google.com (mail-wm1-f58.google.com [209.85.128.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AK4MfxC007855 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Nov 2025 05:22:41 +0100 Received: by mail-wm1-f58.google.com with SMTP id 5b1f17b1804b1-4779da35d27sf3869755e9.3 for ; Wed, 19 Nov 2025 20:22:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1763612556; cv=pass; d=google.com; s=arc-20240605; b=Belf+DCWnSXNRKaRFFhNPR+EHEuGGGxcAsFD5xn+Sj4mzKGhF9PGtSBM/05dY+e9tA 4AQIWFHro4mcvGaBPEbdGWjBddQi83rzJyjO/4TJCBUCAhOc8MYvBvloLGpgAhq11iYQ 2bONO/qVTu+UPi8KLktfkk8ZQ2d7EqGTwfcvrgwTe5OBbDfqt8opX5lqRC2XlXT0QXX2 RbbLggw36tsk5lEZr4Q+ZI3ceysfM6L29LjkDB/AcfFh2HHGKC4qrbxPBCGgXN6D+7q9 QaSbptODpFqKxzMXee0ou9fmfrQpU+YNwLduiR4+Y84psiQXbTbmRYsIY82bOVn5R5X3 5i/g== 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=0g7SJeErL41cj/fWPoxZRrhQVcVJni0IGV/L+Tn4tl4=; fh=zgja3fwPFxzjnfpM6eR8l3MvbWDE9/LnuQWCIrx0ZrE=; b=lIvTSt/MnDLotndX0hf/vczvR8SOIGnDkTPJ7qbQPRHlgxg49DfVdR13hYRPCOZB1Q hvrSrJHuVphXyu3BDPJgc8aNN8OKypOJ8qpvpgHXCNIkEzwhLqX2uCWRGJi7X+9qaxM3 +qLZKzA35eW4sC3+uKRQkOhYhVATJux/Q7DD73YOtgTEF4GRO4yjFD3vfHpGCmpLBoaK sSRhAcpE0KjViU96QYSZLJBZI786M7UefFio8OxcE9jz8QFQPP2dybdUxMDp1S5tkVeF eonunAAuCSaJCzR2sD3w/YXMYPrWAikV3maZ1PsOFClh7L/mCfqGvoarMkV7vjUP7E2i 6pMw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=llgBjrJ8; spf=pass (google.com: domain of fm-1328757-202511200422310bc001b83d0002073a-q1rhw2@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1328757-202511200422310bc001b83d0002073a-q1RHw2@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=1763612556; x=1764217356; 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=0g7SJeErL41cj/fWPoxZRrhQVcVJni0IGV/L+Tn4tl4=; b=oo0uXQbnQDhiDOgjDNubq6ZExQzi1/oIfikevs/t1nWyh9GZidOXMzW4lFbXxMvyOn 5ag/ZzRlEf0gp0+cROuIBF+W0ny6kngcXX2H1KWsj6BiZbh6MOdIoKlzxbwluY55147h DlC4v6Knz9Vr2wrVnbVPZpK4Vrz6jBE+4WsS7S/YAa77a3jGb1PiO0zTxaQaGSGaFrPA WUED++VjxZputLHqKfHlkUYaCrhK2Yb988GmC6eCQow/BDjcHauv0FhBXf56s/4hypD6 OVEixAJ6xYnro6tTg2Gv8oS724oo4Dg4ZlsqgH6KQNUIe0ZlmnlemoA3LJWMu+liorxZ GGpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763612556; x=1764217356; 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=0g7SJeErL41cj/fWPoxZRrhQVcVJni0IGV/L+Tn4tl4=; b=pxV55dpRSZovO2xa/eyx7C5UPLpIdsUsLQYSDzOoEMJdkd8z7DDY0/QC4Oe9AQu49X r8W9XV3YsZp5ZI5eims8MSWM4rcvAQsEivq6Sy4WuhUCHbCywJUFFuLWo+lzRAYgZSwB gwG+usu4J/HkgQodqk23hAjLzeGYVCWjQftgIB2sQDj3fm5DwcFw+b2tFO7pIJx+IHTb HHr4CwpbiF8hp9dnFfDCjhPqjPJ3vTOFZ9Y2GzBYvbPzGPMyiz9p2TJMeL5FdPjilBGi 1WC19XcII7Oz1wkPmMSvhGFoAz7/mRTuY1/vT0LGalUiZyP4gTcx6vBv9FQ0jtasRjMS bNQA== X-Forwarded-Encrypted: i=2; AJvYcCUzI5LRxtBzeVrZlDzGyrVSVFqPekf4HYQHibJBc0IwpBcKr02OqYhG7xg+ZRQNLk8AcAqo1uo=@isar-build.org X-Gm-Message-State: AOJu0Yz5wubfoCfJUodxemuuxuvwnai2D+sRZzgHn4+tpIxyCGO6ikaC A30D/BLwSjtrNWJI6vMX7/NhvTyXzJnr/Pr6KqD/N+9Q0OpX+4fOEm8p X-Google-Smtp-Source: AGHT+IFT1nfEYUFjEBnnJyKL/hfrLFJHuskI/HwK5uh3sVh4uczquhiF9No9rjSyOR/+ZXUs4bxcDA== X-Received: by 2002:a05:600c:1546:b0:477:76bf:e1fb with SMTP id 5b1f17b1804b1-477b8a99292mr16689315e9.16.1763612555299; Wed, 19 Nov 2025 20:22:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+aiH8gckQT/jjpmo+cFQ38BKY+MARrGpqMXusO/Tm8/wQ==" Received: by 2002:a05:600c:3b08:b0:477:a1a3:e379 with SMTP id 5b1f17b1804b1-477b8e1338cls2355335e9.1.-pod-prod-09-eu; Wed, 19 Nov 2025 20:22:32 -0800 (PST) X-Received: by 2002:a05:600c:4f48:b0:45d:d8d6:7fcc with SMTP id 5b1f17b1804b1-477b8c8d922mr13059535e9.27.1763612552129; Wed, 19 Nov 2025 20:22:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763612552; cv=none; d=google.com; s=arc-20240605; b=WR4CcwZ1lrSrC4GEcxSarw+UWfMU/xblAjx88EH6EVE4CwFTX7Zo6CAa0FkhwJ5OSX E/LpsFT/DTdijOLG7leRct9bcAyHsgt/jezKfJWfT+9RsgZjG5mWzIvsDL6inrT150ou JaxDcwvnDEQub43OSsky/hK6+I7fqZ/mH045FCKc3HreXEukIaxQ05V1B83LIh/dO7dF rtLs00WPTUfwVnSRLZnk8jbS/Ef3Zx6qKQpKIinmLDF9C38zsfR8aURr5KUWQ9IeB8U7 VRxL/9dwAPw5p35ofnWgE8oGRKNGXwn7d+hJeLGFhNSmhp4UU3TwF8pV3brH066wArpt Nk/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=SSe7heLOc34BFRzsmSAg/wCvarueZEZx8jtnLz0yz5M=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=c8lir0Hnvqwt25QOQdudinpR7Ei/dWsHI6/KBeLDsXGnjvXWY16t2VNMt+sXBhED/U LgCV43rawGu0eIv5zGXCEeUvo9Oiv63rswdvhBLza9uH1GX/dnmAEkplnQAKNhyRG4JO zGoztatuD+mfsqQx7XFhTWZByhFGw8vzxzINcjRT5k7E0yRvfsX4FwaYjzXY9V17LbI0 YIk9cx3ZyiUcL56zetTRC4BSxGFGDVWyH0XfG4hz6IRARHSLq1OTPZflvskB5gk1v6wF GtT/k35Ro5VpWbPKID9ftuCjUTTEp5Fwfeamt38ZzRTV0aQ7MVITChJQVaZlVj6W08Md bxAg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=llgBjrJ8; spf=pass (google.com: domain of fm-1328757-202511200422310bc001b83d0002073a-q1rhw2@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1328757-202511200422310bc001b83d0002073a-q1RHw2@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 ffacd0b85a97d-42cb7fba9f1si19915f8f.11.2025.11.19.20.22.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Nov 2025 20:22:32 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328757-202511200422310bc001b83d0002073a-q1rhw2@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 202511200422310bc001b83d0002073a for ; Thu, 20 Nov 2025 05:22:31 +0100 X-Patchwork-Original-From: "'Kasturi Shekar' via isar-users" From: Kasturi Shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH] installer: hide device-mapper root partitions from target device list Date: Thu, 20 Nov 2025 09:52:17 +0530 Message-Id: <20251120042217.1759272-1-kasturi.shekar@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1328757:519-21489:flowmailer X-Original-Sender: kasturi.shekar@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=llgBjrJ8; spf=pass (google.com: domain of fm-1328757-202511200422310bc001b83d0002073a-q1rhw2@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1328757-202511200422310bc001b83d0002073a-q1RHw2@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Kasturi Shekar Reply-To: Kasturi Shekar 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_DNSWL_BLOCKED,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?= Root filesystems exposed through device-mapper paths (e.g., /dev/mapper/verityroot or /dev/dm-0) were being included in the list of installable block devices. Since these mapper devices represent the active root filesystem, they must not appear as installation targets. This change resolves the issue by detecting the underlying physical device of the current root and skipping it during block device enumeration. Signed-off-by: Kasturi Shekar --- .../files/usr/bin/deploy-image-wic.sh | 61 +++++++++++++------ 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh index b5ea8119..a4e38876 100755 --- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh @@ -36,22 +36,39 @@ if ! $installer_unattended; then # inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh target_device_list="" current_root_dev_type=$(findmnt / -o fstype -n) + exclude_list=() + if [ "$current_root_dev_type" = "nfs" ]; then current_root_dev="nfs" + exclude_list+=("nfs") else - current_root_dev=$(readlink -f "$(findmnt / -o source -n)") - current_root_dev=${current_root_dev#\/dev/} - fi + # For normal or immutable systems, get the backing device of '/' + root_source=$(findmnt / -o source -n) + root_source_resolved=$(readlink -f "$root_source" 2>/dev/null || echo "$root_source") + current_root_dev=${root_source_resolved#/dev/} + + # Always exclude the exact device mounted as / + exclude_list+=("$current_root_dev") - case $current_root_dev in - mmcblk*) - ;; - nvme*) - ;; - *) - current_root_dev=${current_root_dev%%[0-9]*} - ;; - esac + base_no_part=${current_root_dev%%[0-9]*} + if [ -n "$base_no_part" ]; then + exclude_list+=("$base_no_part") + fi + + # If root is coming through a dm-* device (e.g., dm-verity), + # the actual physical devices appear under /sys/block//slaves/. + # We must exclude those slaves as well, otherwise the installer + # might show the live USB stick as a valid target. + if [ -d "/sys/block/$current_root_dev/slaves" ]; then + for slave in /sys/block/"$current_root_dev"/slaves/*; do + [ -e "$slave" ] || continue + slave_dev=$(basename "$slave") + exclude_list+=("$slave_dev") + slave_base=${slave_dev%%[0-9]*} + [ -n "$slave_base" ] && exclude_list+=("$slave_base") + done + fi + fi echo "Searching for target device..." @@ -102,14 +119,18 @@ if ! $installer_unattended; then # skip ram device ;; *) - case $device in - $current_root_dev*) - # skip the device we are running from - ;; - *) - target_device_list="$target_device_list $device" - ;; - esac + #skip any excluded devices (root and its slaves) + skip_device=0 + for ex in "${exclude_list[@]}"; do + if [[ "$device" == "$ex"* ]]; then + skip_device=1 + break + fi + done + + if [ "$skip_device" -eq 0 ]; then + target_device_list="$target_device_list $device" + fi ;; esac done