From patchwork Thu May 14 09:19:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5076 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 May 2026 11:19:59 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 64E9JmH8025745 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 May 2026 11:19:49 +0200 Received: by mail-lj1-f185.google.com with SMTP id 38308e7fff4ca-393d5b5ae63sf36563951fa.3 for ; Thu, 14 May 2026 02:19:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1778750383; cv=pass; d=google.com; s=arc-20240605; b=k9XBV4qKoWncrljFMHoga+ipBHkW+hZ0onrpV0n0wHX0b0DMuZ4sipEau6PYCf0cN1 FRzK1wUZem93KeSNPyjWh/OphE6kYZYhTDCMUFI81iCPeQkO3b9Fu7NYm0XNnFLz4LSv /1lKVzb3EX4heCyq4V2rNxOyMsW/01fh4dPosCBze27sHPqGfNg/9UwEclNjR6gfaeeF kXXJN+G9P2nlkEYImS9MsWGNCBQxQs+pQrNwq0D8+O6gf4Xd5s1rcKDcDUyQK/cSGQg1 6PSVkXW86auR1PxAxwxS24LWvqqXIFKJuwiHdNAQ3RMUzfCxg0mtl1pzOkEx7h48mhkj 5d+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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=TMDb1Dqkn4e7M/U7/rdJKNirdU6k1RqGxK2CueS8q58=; fh=h6ZjjaDsLDsq/1gb6hzdQ/x2ucn+9QK66vwwUjoLGzM=; b=MAgkXyP2m90MmbD5LIOyrh8LCl/r8XBW6G9hr6SD+XB0I9EgTsIOeg4mOD6v62spAR pJaJHWmSNCIBP5E+YS0v1ScB0KBg4gy8MT+BD5h9vKWDFeq3D5H1U6E0JjmnGJVMCK0R KwXpGWi3TSW5UTJ0n/4bzW2e/qCkPWdub6srC1aRKx4WwUaSXZpc4NNzTf+k1BiMT6ZA B8PYUrOgvdqqiB1hYjRvV+o3mlowrDSMr9Bggt0Je4XuahaEFIMlI2ZpnfeNhKsanm4w 5IkqnIBe0utk+X1xu1hiFVT+bkMyGf4iEvHRijDmd5kK4Q6ncIgP8zIW9k9c1VooEQ7z 6lyg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jE+ew2Pm; spf=pass (google.com: domain of fm-1328757-2026051409193966f34eb052000207e7-ii7e0g@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-2026051409193966f34eb052000207e7-ii7E0G@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=20251104; t=1778750383; x=1779355183; 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TMDb1Dqkn4e7M/U7/rdJKNirdU6k1RqGxK2CueS8q58=; b=JGRCCs71ewjAJVn7gW08ovwr/QWHDlgX3BY8VVWbkj2p6god/b52ysFLJkhJGc1gjr AOewmZ2fzc9DVg5RpcxoJxzHqG+6c1CdVVR4KIC92U/ShORS3Eo/rcRC9ncZCqZfmaQS PoXodzAgXs9R6URx8r5XQFzPzl+LhU8BzSPqNFSVpK7RpTF8vO3dAPbA62t5AJdeh/6P B3s+2heT/BZhvnlDRiAl7Q0JJWCFhFIqeLQmcJYtsAMZuE/UHt8BbfYfDaCvGON4A6cb Dv5Eu8f98tNd0xJHverKLhDWGMjyFNBjInNuVuOKoOcrRf8sPqqNDuIJUn54I5AnHAWf XTZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778750383; x=1779355183; 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TMDb1Dqkn4e7M/U7/rdJKNirdU6k1RqGxK2CueS8q58=; b=cR+pzEkv/h+nZWeCZSnOziaVct4nSssXoBH8V9KFZs5AOimQsQ/4ps1FdQxq2lBvOv GEevdidziGgEtlkpFgDnnmXrfINl1dA1mgSHMgAa58+GN9dAmMXRjCGQUFNglxSB7d4i mDBU5M0Mqe+aoE62UALZTNL5E6WaYdgGOTMFwHOPErnie0iDfPLg0VZVQP++drjnr0rS 76yXx8SpSVcNZt6r88D/JteoIAr/Ooe7rLkYUenlh/21rzYg9IQ4bjEI3hakqTfpqkyr slmbkzV7gge+FyBOzgVpX6A2LjY5ZChruxfcANNiknJw5Lj8lYHP2cfI+ABoNmqS9r71 gPJA== X-Forwarded-Encrypted: i=2; AFNElJ9vkJRfqQGc2jW6E444p1duwjUBfpkcCIuYkq9jY2BK8VBzk1ezLKud5Nty/PtxIE5aEu9hTcs=@isar-build.org X-Gm-Message-State: AOJu0YyB+BU34naQhVWG0foNT5S9AV6pJUxQymrs3qmBpR1+A3h2R6uR i9RYg9YES9wCXwVwciunpqhgurYFT/wnRjvtWBJkVBGnpSrf7YIZHmIV X-Received: by 2002:a05:6512:118a:b0:5a3:6731:910a with SMTP id 2adb3069b0e04-5a8ef979a7emr2370662e87.11.1778750382894; Thu, 14 May 2026 02:19:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AUV6zMN08Pt/s5SLYjk2oc1XJINI6MzCYp4q6e+BYMeZFzNELQ==" Received: by 2002:a2e:8245:0:b0:393:8bf7:a638 with SMTP id 38308e7fff4ca-3948c25d2fals3856131fa.0.-pod-prod-03-eu; Thu, 14 May 2026 02:19:40 -0700 (PDT) X-Received: by 2002:a05:6512:138a:b0:5a8:9f6f:4647 with SMTP id 2adb3069b0e04-5a8ef9b61e3mr2340541e87.35.1778750380183; Thu, 14 May 2026 02:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778750380; cv=none; d=google.com; s=arc-20240605; b=P8+L6BAu4gVPBCn9hT2RCE7qBqtYEkcIVKjj78Nj08fBMmPqP2OjM88LgviFGqEIYy Xgn9gXb16CZZSJC4e94ZV6MyiAO/lH+uis45W8iCIgRwo4+9Yh26PR9PBHU3PeyruSuO kr+P7FOtob23m7LXV6AHDZv8Ruvxc48ff8uSmgIzE/7kepBuoI7b63oNWGv101dgtHM2 FEpH9Lq9LgHdiWl23jiCcuVoPEC3C/V+Ygxo7sPeiu1ld3rvpWdInmAzrnrRz7zGWRrP hHRF57d9TGNwhbkqSSpH/f5aUvjAygy5WTNZKTG15RV7sc5/RZBAykmHtgDliibUWyW0 E+6A== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=YsWzSu2h1OdZL9+OcLVg2KAEYfVdG5HEHGFTa5qx/vI=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=FWdYSHpuWBeqn56uVqKN/zt403nEVaY9eXGfjgvVZm21da9TOwhEUEj/+U42YjNlaj ksTGIlSrguIohPUdKXhlaMehJirdDhN1s8HTiB6Mi8X5TGwnHU8stK5s8ezX6940o31D COF682hqy4H4qxZe3lEvbyyiIpX+ai/DZ2bQ00ln8htKj/nCxkgOw7YtOL9vqokbUmG7 28FVom0TwxWBvNx9QVMNc+OqA4p4M9mtyJpsbsopJ5OOzQQeOrMLyuoRDMZeVWy5c0pe x2ygJeLBmC2j8RIVuxmzcL/6YtL4Xs2GqLU+1DIbHVTD8v0LrAl6DyElGZ1tY/XqRNaD QkWQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jE+ew2Pm; spf=pass (google.com: domain of fm-1328757-2026051409193966f34eb052000207e7-ii7e0g@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-2026051409193966f34eb052000207e7-ii7E0G@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-3945c594b83si388231fa.0.2026.05.14.02.19.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2026 02:19:40 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-2026051409193966f34eb052000207e7-ii7e0g@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2026051409193966f34eb052000207e7 for ; Thu, 14 May 2026 11:19:39 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v2 1/4] installer: extract backend helpers to sys_api.sh Date: Thu, 14 May 2026 14:49:45 +0530 Message-ID: <20260514091951.1572682-2-kasturi.shekar@siemens.com> In-Reply-To: <20260514091951.1572682-1-kasturi.shekar@siemens.com> References: <20260427063957.603123-4-kasturi.shekar@siemens.com> <20260514091951.1572682-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=jE+ew2Pm; spf=pass (google.com: domain of fm-1328757-2026051409193966f34eb052000207e7-ii7e0g@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-2026051409193966f34eb052000207e7-ii7E0G@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?= From: Kasturi Shekar Move backend and system-facing installer logic into sys_api.sh This patch introduces backend helper APIs for: - install image discovery - target device discovery and filtering - root/live-device exclusion - RAID member and inactive md filtering - block device state and size helpers - bmap copy execution with locking and progress pipe support Signed-off-by: Kasturi Shekar --- .../deploy-image/files/usr/bin/sys_api.sh | 400 +++++++++++++++--- 1 file changed, 333 insertions(+), 67 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/sys_api.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/sys_api.sh index b144419e..9c9c5840 100644 --- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/sys_api.sh +++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/sys_api.sh @@ -1,84 +1,350 @@ #!/usr/bin/env bash +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2026 # -# sys_api.sh — Ported installer system APIs -# ------------------------------------------------------------------- +# SPDX-License-Identifier: MIT -# Load shared framework utilities -source ./func.sh || { - echo "Error: func.sh not found or not readable." >&2 - exit 1 +#-------------------------------------------------------------------------- +# sys_api.sh - Backend APIs for deploy-image-wic installer. +# +# This file intentionally contains only system/backend logic: +# - image discovery +# - target device discovery and filtering +# - low-level install/copy flow +# +# UI concerns (dialog boxes, menus, confirmations) are implemented in +# installer_ui.sh and called by the main orchestrator script. +#-------------------------------------------------------------------------- + +# Globals populated by sys_discover_target_devices(). +SYS_CURRENT_ROOT_DEV="" +SYS_TARGET_DEVICES=() + +#-------------------------------------------------------------------------- +# sys_first_default_image_name +# +# Returns: +# basename of matching *.wic* image (excluding *.wic.bmap), or empty. +#-------------------------------------------------------------------------- +sys_first_default_image_name() { + local install_data_dir="$1" + + find "$install_data_dir" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" \ + -exec basename {} \; | head -n 1 +} + +#-------------------------------------------------------------------------- +# sys_list_installable_entries +# +# Returns: +# relative file paths under install_data_dir, one per line. +# Files ending in *.wic.bmap are excluded. +#-------------------------------------------------------------------------- +sys_list_installable_entries() { + local install_data_dir="$1" + + ( + cd "$install_data_dir" || return 1 + find . -type f ! -iname "*.wic.bmap" -print | sed 's#^./##' + ) } -# ------------------------------------------------------------------- -# API: locate_disk_images -# Description: -# Find disk image files (.wic, .wic.bz2) under given path. -# Usage: -# sys_locate_disk_images search_path=/install -# Returns JSON: -# {"error":"", "retval":"0", "images":["/install/image.wic", ...]} -# ------------------------------------------------------------------- -sys_locate_disk_images() { - local -A ARGS - local required=(search_path) - api_args ARGS required[@] "$@" || { - pack_return_data error "$_args_error" retval "1" - return 1 - } - - local fn="${FUNCNAME[0]}" - local path="${ARGS[search_path]}" - - log_info "$fn" "Searching for disk images in '$path'" - - local images - images=$(find "$path" -type f -iname "*.wic*" ! -iname "*.wic.bmap" 2>/dev/null) - - # when no images found in /install - if [[ -z "$images" ]]; then - log_warn "$fn" "No images found." - pack_return_data error "No images found" retval "1" - return 1 +#-------------------------------------------------------------------------- +# sys_resolve_image_path +# +# Arguments: +# install_data_dir - base directory where installable images are stored +# image_or_path - either a relative image filename under install_data_dir +# or an explicit absolute/relative filesystem path +# +# Returns: +# absolute image path if resolvable, else non-zero return code. +#-------------------------------------------------------------------------- +sys_resolve_image_path() { + local install_data_dir="$1" + local image_or_path="$2" + + if [ -f "$image_or_path" ]; then + echo "$image_or_path" + return 0 + fi + + if [ -f "$install_data_dir/$image_or_path" ]; then + echo "$install_data_dir/$image_or_path" + return 0 fi - # Convert newline-separated paths into JSON array elements - local json_images - json_images=$(printf '"%s",' $images | sed 's/,$//') - # final JSON response on stdout - echo "{ \"error\":\"\", \"retval\":\"0\", \"images\":[${json_images}] }" + return 1 } +#-------------------------------------------------------------------------- +# sys_discover_target_devices +# +# Populates globals: +# SYS_CURRENT_ROOT_DEV - current live root device identifier +# SYS_TARGET_DEVICES - array with valid target block devices (/dev/*) +# +# Filtering rules match legacy deploy-image-wic behavior, including: +# - skip installer/live root device and backing devices +# - skip loop/dm/ram/sr/mtd/zram +# - skip inactive md arrays and md members +#-------------------------------------------------------------------------- +sys_discover_target_devices() { + local current_root_dev_type + local current_root_dev + local root_source + local root_source_resolved + local base_no_part + local slave + local slave_dev + local slave_base + local devices + local mmc_devices + local device + local is_raid_member + local holder_path + local holder_name + local state + local skip_device + local ex + + local exclude_list=() + + SYS_TARGET_DEVICES=() + + # Determine the live root device so we do not offer the current system disk + # as an install target. For NFS roots use a special sentinel value. + + current_root_dev_type=$(findmnt / -o fstype -n) + if [ "$current_root_dev_type" = "nfs" ]; then + current_root_dev="nfs" + exclude_list+=("nfs") + else + 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/} + + exclude_list+=("$current_root_dev") + + # Strip partition suffix for common disk names so the base device + # (e.g. /dev/sda or /dev/mmcblk0) also does not become selectable. + if [[ "$current_root_dev" =~ ^(mmcblk|nvme) ]]; then + base_no_part="${current_root_dev%p[0-9]*}" + else + base_no_part="${current_root_dev%%[0-9]*}" + fi + + if [ -n "$base_no_part" ]; then + exclude_list+=("$base_no_part") + fi + + # Exclude backing devices for the live root, such as multipath or RAID + # underlying devices exposed via /sys/block//slaves. + 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 + + SYS_CURRENT_ROOT_DEV="$current_root_dev" + + # Gather block devices from /sys/block while preserving mmcblk devices that + # would otherwise be filtered by the main find expression. + devices=$(find /sys/block/ -type b,c,f,l -not -iname "mmcblk*" -printf "%f\n") || true + mmc_devices=$(find /sys/block/ -type b,c,f,l -iname "mmcblk[0-9]" -printf "%f\n") || true + devices="$devices $mmc_devices" + + for device in $devices; do + is_raid_member=0 + + if [ -d "/sys/block/$device/holders" ] && [ ! -d "/sys/block/$device/md" ]; then + for holder_path in /sys/block/$device/holders/*; do + holder_name=$(basename "$holder_path") + case "$holder_name" in + md[0-9]*) + is_raid_member=1 + break + ;; + esac + done + fi + + if [ "$is_raid_member" -eq 1 ]; then + # Skip RAID member devices, because we only want whole block devices + # available for standalone image installation. + continue + fi + + if [[ "$device" == md* ]]; then + # Accept only active or clean md arrays, reject degraded/inactive RAID sets. + if [ -f "/sys/block/$device/md/array_state" ]; then + state=$(cat /sys/block/$device/md/array_state | tr -d '\n' | tr -d ' ') + if [ "$state" != "active" ] && [ "$state" != "clean" ]; then + echo "Skipping RAID device $device: state='$state'" >&2 + continue + fi + echo "Found RAID device $device: state='$state'" >&2 + else + echo "Skipping RAID device $device: no array_state file" >&2 + continue + fi + fi -# ------------------------------------------------------------------- -# API: sys_list_valid_target_devices -# Description: -# Shell-friendly variant of sys_get_valid_target_devices. -# Prints one valid device per line (absolute path). -# Usage: -# sys_list_valid_target_devices -# Output: -# /dev/sdb -# /dev/sdc -# ------------------------------------------------------------------- -sys_list_valid_target_devices() { - local dev - - for dev in /sys/block/*; do - dev=$(basename "$dev") - - case "$dev" in - loop*|ram*|sr*|mtd*) + case "$device" in + dm-*|loop*|mtd*|sr*|ram*|zram*) continue ;; esac - # skip inactive md devices - if [[ "$dev" == md* ]]; then - [ -f "/sys/block/$dev/md/array_state" ] || continue - state=$(cat /sys/block/$dev/md/array_state) - [ "$state" = "active" ] || [ "$state" = "clean" ] || continue - fi + skip_device=0 + for ex in "${exclude_list[@]}"; do + if [[ "$device" == "$ex"* ]]; then + skip_device=1 + break + fi + done - echo "/dev/$dev" + if [ "$skip_device" -eq 0 ]; then + SYS_TARGET_DEVICES+=("/dev/$device") + fi done } + +#-------------------------------------------------------------------------- +# sys_device_size +# +# Returns: +# human-readable size string from lsblk, or empty if unavailable. +#-------------------------------------------------------------------------- +sys_device_size() { + local device="$1" + lsblk --nodeps --noheadings -o SIZE "$device" 2>/dev/null | tr -d " " +} + +#-------------------------------------------------------------------------- +# sys_device_is_empty +# +# Returns: +# 0 when first 1 MiB is zero-filled, 1 otherwise. +#-------------------------------------------------------------------------- +sys_device_is_empty() { + local device="$1" + cmp /dev/zero "$device" -n 1M >/dev/null 2>&1 +} + +#-------------------------------------------------------------------------- +# sys_version_ge +# +# Returns: +# 0 if current >= required, else 1. +#-------------------------------------------------------------------------- +sys_version_ge() { + local current="$1" + local required="$2" + + if [ "$(printf '%s\n' "$current"X "$required" | sort -V | head -n 1)" != "$current"X ]; then + return 0 + fi + return 1 +} + +#-------------------------------------------------------------------------- +# sys_bmap_options_for_image +# +# Returns: +# bmaptool options string ("--nobmap" when no sidecar bmap is present). +#-------------------------------------------------------------------------- +sys_bmap_options_for_image() { + local image_path="$1" + local disk_bmap + + disk_bmap="${image_path%.wic*}.wic.bmap" + if [ -f "$disk_bmap" ]; then + # If a .wic.bmap sidecar exists, return an empty option string so + # bmaptool uses the bundled map automatically. + echo "" + else + echo "--nobmap" + fi +} + +#-------------------------------------------------------------------------- +# sys_install_image_with_lock +# +# Performs the actual bmaptool copy, serializing concurrent installer +# consoles via flock. When UI hook functions are available, this API +# uses them to present a progress gauge in attended mode. +# +# Optional UI hooks (if defined): +# ui_start_progress_gauge +# ui_stop_progress_gauge +#-------------------------------------------------------------------------- +sys_install_image_with_lock() { + local image_path="$1" + local target_device="$2" + local lockfile="/run/installer.lock" + local progress_pipe="/run/installer.fifo" + local bmap_options + local bmap_version + local quiet_flag="" + + bmap_options=$(sys_bmap_options_for_image "$image_path") + + exec 9>"$lockfile" + if flock -n 9; then + bmap_version=$(bmaptool --version | awk '{ print $NF }') + + if sys_version_ge "$bmap_version" "3.6"; then + if [ -p "$progress_pipe" ]; then + rm -f "$progress_pipe" + fi + + if ! mkfifo "$progress_pipe"; then + echo "Error: Failed to create named pipe $progress_pipe" + return 1 + fi + + bmap_options="$bmap_options --psplash-pipe=$progress_pipe" + quiet_flag="-q" + + if declare -F ui_start_progress_gauge >/dev/null; then + ui_start_progress_gauge "$progress_pipe" + fi + fi + + # Run the actual copying step under the lock to avoid concurrent writes + # from multiple installer consoles or sessions. + if ! bmaptool $quiet_flag copy $bmap_options "$image_path" "$target_device"; then + if declare -F ui_stop_progress_gauge >/dev/null; then + ui_stop_progress_gauge + fi + return 1 + fi + + if declare -F ui_stop_progress_gauge >/dev/null; then + ui_stop_progress_gauge + fi + else + echo "Installation already running in another console." + sleep 5 + + if [ -e "$progress_pipe" ]; then + echo "Installation progress..." + tail -f "$progress_pipe" | while read -r line; do + printf "\r%s%%" "$line" + done + else + echo "Waiting for installation to finish..." + while pgrep -x "bmaptool" >/dev/null; do + sleep 5 + done + fi + fi + + return 0 +} From patchwork Thu May 14 09:19:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5077 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 May 2026 11:20:01 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f61.google.com (mail-ed1-f61.google.com [209.85.208.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 64E9JnlX025756 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 May 2026 11:19:49 +0200 Received: by mail-ed1-f61.google.com with SMTP id 4fb4d7f45d1cf-67c3d3a11cesf7326211a12.0 for ; Thu, 14 May 2026 02:19:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1778750384; cv=pass; d=google.com; s=arc-20240605; b=QFLE2I9e4zM05GlGoTLXc0Q7864II8DjNjrAfvvoGP7UMA41s/y/IZjzUAVwhREtNB wsl3mhmsKKup8l/uAbnUy4NsKsZxvjJmLmEwyo51BqbrhCIYJQQDEUsr9Dbcm0DvCQVs ddtUSQT3pCSEbwCQV5tXVzf8Zcj/8mq5m1Bk+vE/M8WzeI75UUAfw7A5KwqcVRGNdl64 oqPnxBdDTeH2DUviSQhyptTm0iHhWlidM85Qb2u1kfw6huAEnxRzQ9wDrcUYw47JogsW yoiht6rTHctxEqG7ufWCAOzDeRxxKUKxD5OAvdkOOMBQ/ySIqWK3ud0tQ/FNIUf7xSkt 2ydw== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=QVA2m+EhOw3NgG34l3zorDOtOTmAUbx5rgTIgv4mCio=; fh=dmpTWkS4cVOv2RndLOl7S8ASiA48t5GLW/7XAJ8I/qM=; b=jJxsg8zzbj3oVeSXQUma0KzqudOef+yfKzWTZMS9HpqpN8W2UiB3Nti5me8IU4C8Sr 5PlsZhzDK2WN9TUVhnDOvcXFk2BypaPL+4XKvOVaKnEkNrKXt/vbmihS28wYZDF5AV/9 hnQXqZHBp+0ik5gdkndxsVy5dEmquwSolwLalGQGNWsQiLUK6F8WRAPkTHXKSxDstkcp TfFkt9Y7SAsgMcx1dcIqqOyr9BDgWxJVgZZqP08E14RKFZzyhZeoPssXRF1GIX1wO9Sa WGI4rljX9GN2ppQs7utOXXPjrv0Vw/2siZl1f8Mstzrobi1Gb88lzunLRPhwQY1918VD YSZg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RY0m8nJM; spf=pass (google.com: domain of fm-1328757-20260514091940dd025137920002078f-bcfpro@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091940dd025137920002078f-bcFpRO@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=20251104; t=1778750384; x=1779355184; 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QVA2m+EhOw3NgG34l3zorDOtOTmAUbx5rgTIgv4mCio=; b=kVDnktj+W1F7wFnhJnU5IC0MsgFbz3sSdCMnY5yzrcbey2OcrVbHzYgwpg9KQlKHL0 ZE2YcOWpdSFb9Wpscd1POl78i+4BpiY6VIVKW9fejr6m25CflWZ7Ql8IdEMkacCdygFL yTkoQ68zFg45bc5VbHL0empDwfHNPDjOKeGztj5wxnwQLhlbqMM+pIbVBXQVDpy79gOI XO30rqS2bFk4CDWFYNmesxpKbfwchx8liGzE/Hh3DMIjoVHxSiG+4co0qJWq1KsMQGPM GXBDdjznlU7NxuetuR/43erWJpkQD/Pd7mJmKcgOWSjlutdM3EtFrhbridJwMOWDZTju Z90w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778750384; x=1779355184; 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QVA2m+EhOw3NgG34l3zorDOtOTmAUbx5rgTIgv4mCio=; b=g113GoZeHuKhVI0MK38E/FTTEknB4KHjkL9VBmnFwqL8VSzITPFiXHt8DhZy5RwbwJ mlwnxat4oReNlERzw31YZwm2yWAAGN7jwtMhMnToBKx3qrRwU9rouz3X8u0NBfvGdvAs oLP2u3Z+HF0Jw0Uc4fWrXffv8fm+NQmA3GlRhKVlJ/FmA89OvW8CRmbGsnZOA2SVQssV uuyeRsQjid6lLiZq8TNCxjzerAnmo9uZe3OdOjvyMWzp5pk1mCU7pL2kbCNxHJ4zBZ3i RV/z35iRRqba1ik9WeiW8er+KmVwnSwP57AxWdWdfR+/M3ZUjOSZKZ0qFrOz/96w7UQO Ty7g== X-Forwarded-Encrypted: i=2; AFNElJ/0+WI9pYqH2PM66gcaJJeqgatSdGZCT2CQSa3bvaRIWLvVejl7vdV/kmRan4tQQl7ktURYXzw=@isar-build.org X-Gm-Message-State: AOJu0YxqcbkQOLL3jK4AXXzCRJalG1lQLB80EgZ5ARFfkwaAqYtyqAp0 x9F701MXVLGrB/fCnRZLZ6FN8nHUAh0ttDDr1xoSn8f6aAChyfYIVooo X-Received: by 2002:aa7:cd55:0:b0:676:9c8e:fa4f with SMTP id 4fb4d7f45d1cf-68256d5e76bmr3173818a12.20.1778750383820; Thu, 14 May 2026 02:19:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AUV6zMOkdFIaBDPNBA0uVHexAW+t0TxevkYp6Qvc82T19yn+JA==" Received: by 2002:aa7:cad6:0:b0:676:4ba3:ec04 with SMTP id 4fb4d7f45d1cf-6833048a156ls634231a12.2.-pod-prod-01-eu; Thu, 14 May 2026 02:19:41 -0700 (PDT) X-Received: by 2002:a05:6402:405c:20b0:66a:8002:fe17 with SMTP id 4fb4d7f45d1cf-68256c5aa7fmr3247352a12.13.1778750381558; Thu, 14 May 2026 02:19:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778750381; cv=none; d=google.com; s=arc-20240605; b=JC/61Mudv98zgTKRVsaUwPVT0WoYITa3TUt7wG0sw71Wr86cAxtOz/2mt5g7xzX6S3 5+1qCFxK7RoKyDttnjrGLgAGSdwP09GJM49VZ5yEFck+8ne+FDmFHG9eY2JaMjA6IKGO kNZEPn1764vCFZHBQ+ASqxRdSgi3UgRjyXQroB/XPaDsYfC4P/1nsHg7IG7ScOFMj968 SA8vShoynNXuV2ILZpKwFMbSndfbtPvj3xs+7+MBgT7v/SNiE78K83qFnlwDFEQReXUm Cvy6Mn/2hzRZ3dj4AFuecE6KmN5tulnkbv4VWT2JiLQeVKCDTd1aVRXygl3e6T/oTon+ FJPg== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=ukvus698i4Fg7M59mfl1qbqT+qDigW87Jl2QKddtQxI=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=F84oLNH9VJLKyMnfdWUxQl93BoXoLYsJNAOYJmM3hq+KrzYh/6rx0j1PS7tJuL04dH VoqQBB8irCTfifGIHm0ARPiOAx+v8ZCHIwkuwbFbVcltsl4qJb/pXJj83Tn4oYsZ/2Vk J1V3RXqYoHkVar7MfFHISBLVDc/vSHp9RsoJuupB2Vx7hfusDZ+3EDnEoFDKST04mXdm 0gU1a4LLKn90bAgESP5ShI6GLt88Yu5bDcP/bdvA+X06XR2v2PHg7kQcEOmvHrw6yoiI vT7eyRAd6dNcA2UGwbuPw4P4pJp5EGwvoLvUGaC31HWFXleZ3XDp3hEWodFPVugclr7s x/VQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RY0m8nJM; spf=pass (google.com: domain of fm-1328757-20260514091940dd025137920002078f-bcfpro@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091940dd025137920002078f-bcFpRO@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-68311058e41si41827a12.4.2026.05.14.02.19.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2026 02:19:41 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-20260514091940dd025137920002078f-bcfpro@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20260514091940dd025137920002078f for ; Thu, 14 May 2026 11:19:41 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v2 2/4] installer: extract attended UI to installer_ui.sh Date: Thu, 14 May 2026 14:49:46 +0530 Message-ID: <20260514091951.1572682-3-kasturi.shekar@siemens.com> In-Reply-To: <20260514091951.1572682-1-kasturi.shekar@siemens.com> References: <20260427063957.603123-4-kasturi.shekar@siemens.com> <20260514091951.1572682-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=RY0m8nJM; spf=pass (google.com: domain of fm-1328757-20260514091940dd025137920002078f-bcfpro@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091940dd025137920002078f-bcFpRO@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?= From: Kasturi Shekar Move attended dialog interactions into installer_ui.sh The new UI module provides: - image selection menu - target device selection menu - install and overwrite confirmation dialogs - error and info dialogs - attended progress gauge hooks Signed-off-by: Kasturi Shekar --- .../files/usr/bin/installer_ui.sh | 217 +++++++++++++----- 1 file changed, 161 insertions(+), 56 deletions(-) mode change 100755 => 100644 meta-isar/recipes-installer/deploy-image/files/usr/bin/installer_ui.sh diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/installer_ui.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/installer_ui.sh old mode 100755 new mode 100644 index 33685c6f..9d3ba5de --- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/installer_ui.sh +++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/installer_ui.sh @@ -1,86 +1,191 @@ #!/usr/bin/env bash +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2026 # -# installer_ui.sh — Attended installer frontend -# ------------------------------------------------ +# SPDX-License-Identifier: MIT -SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)" -INSTALL_DATA=${INSTALL_DATA:-./install} +#-------------------------------------------------------------------------- +# installer_ui.sh - Frontend/UI helpers for isar installer. +# +# This file is intentionally UI-only: +# - dialog menus and message boxes +# - attended confirmations +# - user abort countdown handling +#-------------------------------------------------------------------------- +UI_GAUGE_PID="" + +#-------------------------------------------------------------------------- +# ui_show_error +# +# Displays an error dialog in attended mode. +#-------------------------------------------------------------------------- +ui_show_error() { + local message="$1" + dialog --msgbox "$message" 6 60 +} -# Backend APIs -. "$SCRIPT_DIR/sys_api.sh" +#-------------------------------------------------------------------------- +# ui_show_info +# +# Displays an informational dialog in attended mode. +#-------------------------------------------------------------------------- +ui_show_info() { + local message="$1" + dialog --msgbox "$message" 6 60 +} + +#-------------------------------------------------------------------------- +# ui_countdown_allow_attended_switch +# +# In unattended mode, this gives users a chance to switch to attended +# mode by pressing any key. Returns 0 when attended mode should be +# used, and 1 otherwise. +#-------------------------------------------------------------------------- +ui_countdown_allow_attended_switch() { + local timeout="$1" + local abort_file="$2" + local i + + # Countdown loop prints a message once per second and accepts a key press. + # If any key is pressed, create the abort trigger file for the caller. + for ((i=timeout; i>0; i--)); do + echo -ne "\rUnattended installation will start in $i seconds. Press any key to switch to attended mode..." + + if [ -f "$abort_file" ] || read -n 1 -t 1; then + touch "$abort_file" + echo + return 0 + fi + done -# ------------------------------------------------ -# Helpers -# ------------------------------------------------ -die() { - dialog --msgbox "$1" 6 60 - exit 1 + echo + return 1 } -# ------------------------------------------------ -# UI: Select image -# ------------------------------------------------ -ui_select_image() { - local images json list=() +#-------------------------------------------------------------------------- +# ui_select_image_menu +# +# Uses sys_list_installable_entries backend API and returns selected +# relative image path on stdout. +#-------------------------------------------------------------------------- +ui_select_image_menu() { + local install_data_dir="$1" + local list=() + local entry + local selected - # On failure, show error dialog and exit - json=$(sys_locate_disk_images search_path="$INSTALL_DATA") || \ - die "No installable images found in $INSTALL_DATA" + while IFS= read -r entry; do + [ -n "$entry" ] || continue + list+=("$entry" "$entry") + done < <(sys_list_installable_entries "$install_data_dir") - # Extract image paths from JSON - images=$(echo "$json" | sed -n 's/.*"images":\[\(.*\)\].*/\1/p' | tr -d '"' | tr ',' '\n') + if [ "${#list[@]}" -eq 0 ]; then + return 1 + fi - # Building dialog menu entries - for img in $images; do - base=$(basename "$img") - list+=("$img" "$base") - done + selected=$(dialog --no-tags \ + --menu "Select image to be installed" 12 70 6 \ + "${list[@]}" --output-fd 1) || return 2 - # Display menu and capture selection - INSTALL_IMAGE=$(dialog --no-tags \ - --menu "Select image to install" 10 70 5 \ - "${list[@]}" \ - --output-fd 1) || exit 0 + echo "$selected" + return 0 } -# ------------------------------------------------ -# UI: Select target device -# ------------------------------------------------ -ui_select_target_device() { +#-------------------------------------------------------------------------- +# ui_select_target_device_menu +# +# Displays candidate target devices and returns selected /dev path. +#-------------------------------------------------------------------------- +ui_select_target_device_menu() { local list=() + local target + local target_size + local state + local selected - devices=$(sys_list_valid_target_devices) || \ - die "No valid target devices found" + for target in "$@"; do + [ -b "$target" ] || continue - for dev in $devices; do - [ -b "$dev" ] || continue + target_size=$(sys_device_size "$target") + [ -n "$target_size" ] || target_size="unknown" - size=$(lsblk --nodeps --noheadings -o SIZE "$dev" 2>/dev/null | tr -d " ") - [ -z "$size" ] && size="unknown" - - if cmp /dev/zero "$dev" -n 1M >/dev/null 2>&1; then + # Indicate whether the selected device is already empty, to help users + # avoid accidental overwrite of data. + if sys_device_is_empty "$target"; then state="empty" else state="contains data" fi - list+=("$dev" "$dev ($size, $state)") + list+=("$target" "$target ($target_size, $state)") done - if [ "${#list[@]}" -lt 2 ]; then - die "no installable target devices available" + if [ "${#list[@]}" -eq 0 ]; then + return 1 fi - TARGET_DEVICE=$(dialog --no-tags \ - --menu "Select target device" 10 70 6 \ - "${list[@]}" \ - --output-fd 1) || exit 0 + selected=$(dialog --no-tags \ + --menu "Select device to install image to" 12 70 6 \ + "${list[@]}" --output-fd 1) || return 2 + + echo "$selected" + return 0 } -run_interactive_installer() { - clear - ui_select_image - ui_select_target_device +#-------------------------------------------------------------------------- +# ui_confirm_install +# +# Returns: +# 0 when user confirms, 1 when canceled. +#-------------------------------------------------------------------------- +ui_confirm_install() { + local image_path="$1" + local target_device="$2" + local target_size="$3" + + dialog --yes-label Ok --no-label Cancel \ + --yesno "Start installing\n'$image_path'\nto $target_device (capacity: $target_size)" 8 70 +} + +#-------------------------------------------------------------------------- +# ui_confirm_overwrite +# +# Returns: +# 0 when user accepts overwrite, 1 when canceled. +#-------------------------------------------------------------------------- +ui_confirm_overwrite() { + dialog --defaultno --yesno "WARNING: Target device is not empty! Continue anyway?" 8 70 +} + +#-------------------------------------------------------------------------- +# ui_start_progress_gauge +# +# Opens a dialog gauge and updates it from bmaptool psplash pipe. +#-------------------------------------------------------------------------- +ui_start_progress_gauge() { + local pipe_path="$1" + + ( + while true; do + if read -r line < "$pipe_path"; then + percentage=$(echo "$line" | awk '{ print $2 }') + echo "$percentage" + fi + done + ) | dialog --gauge "Flashing image, please wait..." 10 70 0 & + + UI_GAUGE_PID=$! +} + +#-------------------------------------------------------------------------- +# ui_stop_progress_gauge +# +# Best-effort termination of the active progress gauge process. +#-------------------------------------------------------------------------- +ui_stop_progress_gauge() { + if [ -n "$UI_GAUGE_PID" ]; then + kill "$UI_GAUGE_PID" 2>/dev/null || true + UI_GAUGE_PID="" + fi } -run_interactive_installer From patchwork Thu May 14 09:19:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5078 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 May 2026 11:20:02 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f61.google.com (mail-ej1-f61.google.com [209.85.218.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 64E9Joir025831 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 May 2026 11:19:50 +0200 Received: by mail-ej1-f61.google.com with SMTP id a640c23a62f3a-b8f848ebcbbsf646059466b.0 for ; Thu, 14 May 2026 02:19:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1778750385; cv=pass; d=google.com; s=arc-20240605; b=ClAjarZxFpIr/MYe4Jvm9+3DCpea/WsQ1FLn7IN+48WtDTTuSyqyBECdx+TShOCsgs J3uRifSaFNmnfTzCO2NI1XcVK8UGYjvhJSKcQ4K6RTrN2gdnTSC7O0jd1HA4A5L6USXC J44+lbW4ZUlgmufhpbCpahwtKcjaVz5CSVVtfVmbVIgIrx68z1ADG1MJuq63FmdhEIxW 764ht5lR203fhOgf5/0pWF6fjQXcq8Asbqb7BrDoLLEoG51r2uK0U6yttLxLXe7vHutm qjrYXW1tjLI85cx7I0PqvQWN/hLhhyjScp226ym7NlrD70tjphqMLHS179LuiEqCbpgv RuPQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5bJlvptEJjBMU7GWu0AvOR1DeT00B+2oFF5ihVwIcLw=; fh=NE9djDauaaea6+pLAXiAAaYjatC8tJu1wxENLnm+uks=; b=I6pOGtDU4fp0R5HPP3VjghBlmFqJKdCd8chAG33dccI/sqCFe9iPuDAiXjyIa+SXbN x5gE0OF/BrwBCkzQrTNcke+Q1lFRuPrT5QzKCRE9BkBSGj1TXkFjp/N+cwGyPTUp+zBc jTCYg+4cSpZ7rpswPGx2ZB0TMebYwGZcY4gZHY88x7RyTs743omZ0Y3juuLinuhLArxH XvUChO7ulqrr+u/WsGsBUzonK+cZaTHzK7Ew9fOjr6impuUgsuQFa69SNm9wONipLtBT kSXj1SOLdsQ8gxy6TyBkUrkmkRgBTMOziomx/bzAnKSJRHSRK+/V6dgGW7LhUQEvFB0j EN7A==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=IJh3OGhU; spf=pass (google.com: domain of fm-1328757-20260514091942e6a899fd2100020708-f9d_ir@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091942e6a899fd2100020708-f9D_Ir@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=20251104; t=1778750385; x=1779355185; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=5bJlvptEJjBMU7GWu0AvOR1DeT00B+2oFF5ihVwIcLw=; b=YPlpIIF3d49vfFVP7DCc4gdwQyRqDUjHgF6CMyFFku5F+2wFCNM721WF9LaoCPB9rn Z2oh6/29IE1104WWbe6BJjfdIQJ1x/as2gQSIpfrBldKMttXS+TALM/14DwV/BeuRn2D vJsbwJScBorrwf+9HkZavwPhOBm9JSaWV39F41P65+Y8m6LukbMBKQA0YWOdrPFTnuF9 yI/H/94q83B4VKm2Gt/0/I4eoJZeN1BQps980p0kK2vTeYTNP0q9bGbohHf+yzx0+o6w UFQq9ne0RHtdEZD5f8sZomDgI1Xe5ix3D2FbECs+7z7EK9ng9YHCk/W0/DgEocgoPhst c6GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778750385; x=1779355185; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5bJlvptEJjBMU7GWu0AvOR1DeT00B+2oFF5ihVwIcLw=; b=TJwkoLDVgL4MQiD3+NRMivK60x4JE23Qct3JH+fpu0S4oR4tcfWGMx0+mQ9sFkztbe G6xsAxKL2DM0jP6ESk7lkuFWK1J0P9ZEzgOQvkKSosOM5K+vQbPwHr7Lr1KOFplIsjQ0 pCvJQ6Bh2HBvscroSJzX/3mut3dP9rwJ6WwVvMApSL7WT8Sk5pRtnMaqSuceEBoYUV8g O9KuIsbhh1HL7iMcAkaOR7kjlw+ZrUHv4BPHENIJ7PykeUdO2/3du22m2UsLTpIB+Wt9 viWJRigmbhSI5GvS6a3ZwhS98VEXLh5fbKzbHJjOrBHP2A1xIJcMhQj6ENjFraRcNmuQ WLAw== X-Forwarded-Encrypted: i=2; AFNElJ94t4O0NszOXDis63SGhsXPeZ7cWFgwqLDJZhEKH7HUsJUqxoq1UjiFlj6x4PloSY0TsqDDofI=@isar-build.org X-Gm-Message-State: AOJu0Yzl89LsgCBMWaqYOcFRHN/cn10p/saAvHvRp2jr/vjpuKJHwqpq FVzINMC/DQzA4DbOjQufjJZe2oDBDadmP5rYk8NXxdsfHokfw1+LH5/n X-Received: by 2002:a17:907:7ba6:b0:bd5:a7c:f358 with SMTP id a640c23a62f3a-bd50a7cf697mr31645266b.47.1778750384940; Thu, 14 May 2026 02:19:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AUV6zMNoG65OZijlW8yhprTbuEEQbZ5ZHIobF+yFDQE8HCqQLA==" Received: by 2002:a05:6402:1394:b0:67b:7c3f:d238 with SMTP id 4fb4d7f45d1cf-6832de5aa04ls517801a12.0.-pod-prod-05-eu; Thu, 14 May 2026 02:19:43 -0700 (PDT) X-Received: by 2002:a05:6402:3224:b0:683:6705:6e09 with SMTP id 4fb4d7f45d1cf-68367057056mr221920a12.13.1778750382865; Thu, 14 May 2026 02:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778750382; cv=none; d=google.com; s=arc-20240605; b=hBt45uchm/F7iwJlOv4p+EFybKTRceBe6c7fnKV6AIcLEOFwrc0MKnTqhxyTiZx/Mi 2vH+2krkaGBtwDcTw1FkD8Onnl7ji0qksSpM/MGwaui6/e/TysUR1lLQ0ezGDgWY7pS+ VgBJqkBjIcS36QnpQIIJkulQtHMPKQxBTl9+cMCu4zONdXDaIze9Sy+i8zNyB1KqveRV OfhcnN1acnzCASJHx/GKgMzcvqU9D2tit7MxqjfmG1716z3ymC0I83blHSJxfd7u6to2 T6tJag7RuKe2OWXvCXUUSL2OmVxLHaffz565CsII81EkHaYsj9YWmLnToaPovez6lRXP tZLg== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=RMeKT9ncX4fxpuvtmuGNWPRsjC05lnaky/fZe1UtSdk=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=kTHPCy9by+pJXSJ0A6VEOc4fFtT4bBXQ7R1EWPvw0ZyRn35q0sROGKlCKZqf15fl74 zRY+nJTeagOP84mPoWnTFwBgVguVR1QBNVnDIBalWzni3v1ljQWrWoDQXHXZBgFNq9r8 jfQJ/k5nzuHnu8QsebU3uF6H/VGW4DYdnOwrBoRJtQaXD/iCM5CQSEq/3R6Gq9rjDl/W WovD36USf1Ha8zrS+GeQKBnJy2ToodVnRSa3Qiyc+gxOls5NKaDEamAlObQl2BoZ3PAa MBw5HOZHFaZgEwjQrhwPmXHz021WWDWVPGb+JVI8pgg9FDdeccunShtlk4TJnoYzOVh3 AAsA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=IJh3OGhU; spf=pass (google.com: domain of fm-1328757-20260514091942e6a899fd2100020708-f9d_ir@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091942e6a899fd2100020708-f9D_Ir@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-68311058e41si41827a12.4.2026.05.14.02.19.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2026 02:19:42 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-20260514091942e6a899fd2100020708-f9d_ir@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20260514091942e6a899fd2100020708 for ; Thu, 14 May 2026 11:19:42 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v2 3/4] installer: add installer flow module and entrypoint Date: Thu, 14 May 2026 14:49:47 +0530 Message-ID: <20260514091951.1572682-4-kasturi.shekar@siemens.com> In-Reply-To: <20260514091951.1572682-1-kasturi.shekar@siemens.com> References: <20260427063957.603123-4-kasturi.shekar@siemens.com> <20260514091951.1572682-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=IJh3OGhU; spf=pass (google.com: domain of fm-1328757-20260514091942e6a899fd2100020708-f9d_ir@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091942e6a899fd2100020708-f9D_Ir@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_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: Kasturi Shekar high-level orchestration and keep deploy-image-wic.sh as a thin launcher. This keeps the externally used script name stable while making the flow easier to review and maintain by separating: - backend APIs - UI frontend - mode/orchestration flow Signed-off-by: Kasturi Shekar --- .../files/usr/bin/deploy-image-wic.sh | 475 +++++++----------- 1 file changed, 192 insertions(+), 283 deletions(-) mode change 100755 => 100644 meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh 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 old mode 100755 new mode 100644 index 9a4102b2..a692b679 --- 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 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # This software is a part of Isar. -# Copyright (C) Siemens AG, 2024 +# Copyright (C) Siemens AG, 2026 # # SPDX-License-Identifier: MIT @@ -9,293 +9,202 @@ installdata=${INSTALL_DATA:-/install} SCRIPT_DIR=$( dirname -- "$( readlink -f -- "$0"; )"; ) . "${SCRIPT_DIR}/../lib/deploy-image-wic/handle-config.sh" +. "${SCRIPT_DIR}/sys_api.sh" +. "${SCRIPT_DIR}/installer_ui.sh" -if [ "$installer_unattended" = true ] && [ "$installer_unattended_abort_enable" = true ]; then - abort_file=/run/attended_mode_trigger - for ((i=$installer_unattended_abort_timeout; i>0; i--)); do - echo -ne "\rUnattended installation will start in $i seconds. Press any key to switch to attended mode..." +#-------------------------------------------------------------------------- +# This module contains high-level installer flow logic +# while keeping low-level backend APIs in sys_api.sh +# and user-facing dialogs in installer_ui.sh. +#-------------------------------------------------------------------------- - # Switch to attended mode if the abort file exists or any key pressed during countdown - # Create abort file to notify all other console instances to abort - if [ -f "$abort_file" ] || read -n 1 -t 1; then - installer_unattended=false - touch "$abort_file" - break - fi - done -fi - -if ! $installer_unattended; then - installer_image_uri=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) - if [ -z "$installer_image_uri" ] || [ ! -f "$installdata/$installer_image_uri" ]; then - pushd "$installdata" - for f in $(find . -type f ! -iname "*.wic.bmap"); do - array+=("$f" "$f") - done - popd - if [ ${#array[@]} -gt 0 ]; then - if ! installer_image_uri=$(dialog --no-tags \ - --menu "Select image to be installed" 10 60 3 \ - "${array[@]}" --output-fd 1); then - exit 0 - fi - fi - fi - - if [ ! -f "$installdata/$installer_image_uri" ]; then - dialog --msgbox "Could not find an image to install. Installation aborted." 6 60 - exit 1 - fi - - # 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 - # 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") - - if [[ "$current_root_dev" =~ ^(mmcblk|nvme) ]]; then - base_no_part="${current_root_dev%p[0-9]*}" - else - base_no_part="${current_root_dev%%[0-9]*}" - fi - 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..." - - devices=$(find /sys/block/ -type b,c,f,l -not -iname "mmcblk*" -printf "%f\n") || true - mmc_devices=$(find /sys/block/ -type b,c,f,l -iname "mmcblk[0-9]" -printf "%f\n") || true - devices="$devices $mmc_devices" - - for device in $devices; do - is_raid_member=0 - - if [ -d "/sys/block/$device/holders" ] && [ ! -d "/sys/block/$device/md" ]; then - for holder_path in /sys/block/$device/holders/*; do - holder_name=$(basename "$holder_path") - case "$holder_name" in - md[0-9]*) - is_raid_member=1 - break - ;; - esac - done - fi - - if [ "$is_raid_member" -eq 1 ]; then - continue # Skip RAID member disks - fi - - if [[ "$device" == md* ]]; then - if [ -f "/sys/block/$device/md/array_state" ]; then - state=$(cat /sys/block/$device/md/array_state) - if [ "$state" != "active" ] && [ "$state" != "clean" ]; then - continue - fi - else - continue - fi - fi - - case $device in - dm-*) - # skip device-mapper device - ;; - loop*) - # skip loop device - ;; - mtd*) - ;; - sr*) - # skip CDROM device - ;; - ram*) - # skip ram device - ;; - zram*) - # skip zram device - ;; - *) - #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 - - if [ -z "${target_device_list}" ]; then - dialog --msgbox "You need another device (besides the live device /dev/${current_root_dev}) to install the image. Installation aborted." 7 60 - exit 1 - fi - - if [ "$(echo "$target_device_list" | wc -w)" -gt 1 ]; then - array=() - for target in $(echo "$target_device_list" | xargs -n1 | sort); do - target_size=$(lsblk --nodeps --noheadings -o SIZE /dev/"$target" | tr -d " ") - if cmp /dev/zero /dev/"$target" -n 1M; then - state="empty" - else - state="contains data" - fi - array+=("/dev/$target" "/dev/$target ($target_size, $state)") - done - if ! installer_target_dev=$(dialog --no-tags \ - --menu "Select device to install image to" 10 60 3 \ - "${array[@]}" --output-fd 1); then - exit 0 - fi - else - installer_target_dev="/dev/$(echo "$target_device_list" | tr -d " ")" - fi - TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$installer_target_dev" | tr -d " ") - if ! dialog --yes-label Ok --no-label Cancel \ - --yesno "Start installing\n'$installer_image_uri'\nto $installer_target_dev (capacity: $TARGET_DEVICE_SIZE)" 7 60; then - exit 0 - fi - - # set absolute paths to be compatible with unattended mode - installer_image_uri="$installdata/$installer_image_uri" -fi - -if ! cmp /dev/zero "$installer_target_dev" -n 1M; then - if ! $installer_unattended; then - if ! dialog --defaultno \ - --yesno "WARNING: Target device is not empty! Continue anyway?" 5 60; then - exit 0 - fi - else - if [ "$installer_target_overwrite" != "OVERWRITE" ]; then - echo "Target device is not empty! -> Abort" - echo "If you want to override existing data set \"installer.target.overwrite=OVERWRITE\" on your kernel cmdline or edit your \"auto.install\" file accordingly." - - exit 1 - fi - fi -fi - -bmap_options="" - -# bmap file is expected to be next to the installer image -DISK_BMAP="${installer_image_uri%.wic*}.wic.bmap" - -if [ ! -f "$DISK_BMAP" ]; then - bmap_options="--nobmap" -fi - -if ! $installer_unattended; then - clear -fi - -# Function to compare version numbers -version_ge() { - if [ "$(printf '%s\n' "$1"X "$2" | sort -V | head -n 1)" != "$1"X ]; then - return 0 - else - return 1 - fi +#-------------------------------------------------------------------------- +# flow_run_attended +# +# Handles all attended-mode interactions and assigns: +# installer_image_uri +# installer_target_dev +# +# Returns: +# 0 on success +# 1 on hard error +# 2 on user cancel +#-------------------------------------------------------------------------- +flow_run_attended() { + local default_image + local selected_image + local selected_target + local target_device_size + + default_image=$(sys_first_default_image_name "$installdata") + if [ -n "$default_image" ] && [ -f "$installdata/$default_image" ]; then + installer_image_uri="$default_image" + fi + + if [ -z "$installer_image_uri" ] || [ ! -f "$installdata/$installer_image_uri" ]; then + selected_image=$(ui_select_image_menu "$installdata") + case $? in + 0) + installer_image_uri="$selected_image" + ;; + 1) + ui_show_error "Could not find an image to install. Installation aborted." + return 1 + ;; + 2) + return 2 + ;; + *) + return 1 + ;; + esac + fi + + if [ ! -f "$installdata/$installer_image_uri" ]; then + ui_show_error "Could not find an image to install. Installation aborted." + return 1 + fi + + echo "Searching for target device..." + sys_discover_target_devices + if [ "${#SYS_TARGET_DEVICES[@]}" -eq 0 ]; then + ui_show_error "You need another device (besides the live device /dev/${SYS_CURRENT_ROOT_DEV}) to install the image. Installation aborted." + return 1 + fi + + if [ "${#SYS_TARGET_DEVICES[@]}" -gt 1 ]; then + selected_target=$(ui_select_target_device_menu "${SYS_TARGET_DEVICES[@]}") + case $? in + 0) + installer_target_dev="$selected_target" + ;; + 1) + ui_show_error "No installable target devices available. Installation aborted." + return 1 + ;; + 2) + return 2 + ;; + *) + return 1 + ;; + esac + else + installer_target_dev="${SYS_TARGET_DEVICES[0]}" + fi + + target_device_size=$(sys_device_size "$installer_target_dev") + if ! ui_confirm_install "$installer_image_uri" "$installer_target_dev" "$target_device_size"; then + return 2 + fi + + installer_image_uri="$installdata/$installer_image_uri" + return 0 } -lockfile="/run/installer.lock" -progress_pipe="/run/installer.fifo" - -exec 9>"$lockfile" -if flock -n 9; then - # Get bmap-tools version - bmap_version=$(bmaptool --version | awk '{ print $NF }') - - if version_ge "$bmap_version" "3.6"; then - if ! mkfifo "$progress_pipe"; then - echo "Error: Failed to create named pipe $progress_pipe" - exit 1 - fi - - # Add psplash pipe to bmap_options - bmap_options="$bmap_options --psplash-pipe=$progress_pipe" - quiet_flag="-q" - - # Initialize the dialog gauge and update it dynamically - ( - while true; do - if read -r line < "$progress_pipe"; then - percentage=$(echo "$line" | awk '{ print $2 }') - echo "$percentage" - fi - done - ) | dialog --gauge "Flashing image, please wait..." 10 70 0 & - - gauge_pid=$! - fi - - if ! bmaptool $quiet_flag copy $bmap_options "$installer_image_uri" "$installer_target_dev"; then - kill "$gauge_pid" - exit 1 - fi - - # Attempt to terminate the gauge process if still running. - # Errors are ignored since the process may already have exited. - kill "$gauge_pid" 2>/dev/null -else - echo "Installation already running in another console." +#-------------------------------------------------------------------------- +# flow_validate_target_overwrite_policy +# +# Enforces overwrite policy for non-empty targets in both attended and +# unattended modes. +# +# Returns: +# 0 when policy permits installation +# 1 when policy rejects installation +# 2 when user cancels in attended mode +#-------------------------------------------------------------------------- +flow_validate_target_overwrite_policy() { + if sys_device_is_empty "$installer_target_dev"; then + return 0 + fi + + if ! $installer_unattended; then + if ! ui_confirm_overwrite; then + return 2 + fi + else + if [ "$installer_target_overwrite" != "OVERWRITE" ]; then + echo "Target device is not empty! -> Abort" + echo "If you want to override existing data set \"installer.target.overwrite=OVERWRITE\" on your kernel cmdline or edit your \"auto.install\" file accordingly." + return 1 + fi + fi + + return 0 +} - # Wait for running console to create the progress pipe - sleep 5 +#-------------------------------------------------------------------------- +# flow_maybe_switch_to_attended +# +# If unattended abort-by-key is enabled, this function offers a timeout +# window to switch to attended mode. +#-------------------------------------------------------------------------- +flow_maybe_switch_to_attended() { + local abort_file + + if [ "$installer_unattended" = true ] && [ "$installer_unattended_abort_enable" = true ]; then + abort_file=/run/attended_mode_trigger + if ui_countdown_allow_attended_switch "$installer_unattended_abort_timeout" "$abort_file"; then + installer_unattended=false + fi + fi +} - # Check if progress pipe exists and has content - if [ -e "$progress_pipe" ]; then - echo "Installation progress..." - tail -f "$progress_pipe" | while read line; do - printf "\r%s%%" "$line" - done - else - # Periodically check if bmaptool is still running every 5 seconds - echo "Waiting for installation to finish..." - while pgrep -x "bmaptool" > /dev/null; do - sleep 5 - done - fi -fi +#-------------------------------------------------------------------------- +# flow_run +# +# Main installer flow combining attended/unattended execution paths. +#-------------------------------------------------------------------------- +flow_run() { + flow_maybe_switch_to_attended + + if ! $installer_unattended; then + flow_run_attended + case $? in + 0) + ;; + 2) + return 0 + ;; + *) + return 1 + ;; + esac + fi + + flow_validate_target_overwrite_policy + case $? in + 0) + ;; + 2) + return 0 + ;; + *) + return 1 + ;; + esac + + if ! $installer_unattended; then + clear + fi + + if ! sys_install_image_with_lock "$installer_image_uri" "$installer_target_dev"; then + if ! $installer_unattended; then + ui_show_error "Installation failed." + fi + return 1 + fi + + if ! $installer_unattended; then + ui_show_info "Installation was successful. System will be rebooted. Please remove the USB stick." + else + echo "Installation was successful." + fi + + return 0 +} -if ! $installer_unattended; then - dialog --title "Reboot" \ - --msgbox "Installation was successful. System will be rebooted. Please remove the USB stick." 6 60 -else - echo "Installation was successful." -fi +# Entrypoint: run the installer flow and propagate status. +flow_run +exit $? -exit 0 From patchwork Thu May 14 09:19:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5079 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 May 2026 11:20:02 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f57.google.com (mail-ej1-f57.google.com [209.85.218.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 64E9Jpif025837 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 May 2026 11:19:51 +0200 Received: by mail-ej1-f57.google.com with SMTP id a640c23a62f3a-b941d4b7f2csf751562966b.1 for ; Thu, 14 May 2026 02:19:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1778750386; cv=pass; d=google.com; s=arc-20240605; b=Gr+crdWOLFQ/vmpnkv4+9zB/OfPx69qs5EW6sVpL49Tas7YfNJTFTJjii0pYFpK2xy n8wazBMhcLZGrI7352F47B6Up4ZiC3P8OhxYDUH8ySE7cS4Iamhfr47+cJrIjJC2Seh1 w4F7dnxgOgakisj4BrP8QawMk2dufws+zsWAvIpwv2ehjYDYsGvySiez8H8ybzN+vYbZ rSLrNhBbuAYnqDlffD31Kwik0zZun8W4rWBBt7iDw6sz7PmC/YKqum6q7assPyHJSDe+ PNszpv8MXcQKIQM0KNoZ/8TZni4SJ8OJCQ0FFHfVtcOFPELGmmat1GpDqyl2GpffeDpW K3Gw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TEL4+sqCF4cZi9vJVQpQbE9Nt7+hrv3f37TMf34msDM=; fh=hnQpbRA8C/1MSuAeGfzwzziGYjZRR4pgHWcQzhIiTQ4=; b=SMyuaoUHLpQfI6ajKzOsfqLZn0qU2KvVGXm0knErGEiprE2mN5gAm/I/hSkxkHWuTT d/AKzhaWZ4+YtvuTzQ2KpzS65Hag3m37eBDvlBGAyaALTp5DtN6S2aB6V8rZF9QYD/uJ frZfFaRWVJNqAsxQKM+2mGGuQSo5OlBa2e1fysmGlTS/tFHOeUjQH1pOqG5wBlim0NlN NdxwOk69SgnrmkC9cdBV8GYwSOX0Yf+lgD4zJSIUuQZJUVJ7Ei3xbIwFBiVPBYfKd7Ok BSgb2kf2pbEKq109a93WvlRzu6ad7gusgs2mW5ehOANXcywv/mHYWOTGHA048ZKsbS7r 8M9w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=it30catw; spf=pass (google.com: domain of fm-1328757-20260514091944e83a43279d0002072f-e4ol9z@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091944e83a43279d0002072f-e4oL9z@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=20251104; t=1778750386; x=1779355186; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=TEL4+sqCF4cZi9vJVQpQbE9Nt7+hrv3f37TMf34msDM=; b=OJ7hwFH6j3mFzhuMZ08pdpVHlpGL3IP38vMk7WPXgvkqgabPjnnkxfeC1Uije2rZtt umFK0QD2EUPSaZF5MgG3Sq5cvcjrXqoMkRzOce4Zo/yZA2WvwNkYwPk6EaRklgtP0Dwb h6trDMQWSt+Gpza/YXa05KkiSeyi9qdV81OFKzScsWyXasB98Hzu8/EXl9CfuCbORqhZ /GhmogkJ+Msu43vfA/pQYaEwR68KJDbECqUW2Cnbdj9b6Ssd25gkZGQYS3eyFHZmGX6d kyBRiXXWZIatQ66SWJ8t1A9fFlk+Z9AYFIFqnjoYVMVezoaMP3p91958ZYWRzQsZSZdE +Yww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778750386; x=1779355186; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TEL4+sqCF4cZi9vJVQpQbE9Nt7+hrv3f37TMf34msDM=; b=MGcAou6DzJTbexPqJUb8aSSX4HXNvBjxkBxmswOLxcJRGfrk/GRhUXouswarKs101M 9jFW0SWwlcKjmKcOI2Wsz6CDsAE9vy0Z6yHTXx5vhSvH+aQ6IhaHh/6DNgzzx3CQVZeR atS7bxga1hA0XzNqfqp3NubrpvnPRHHR8GrsE9kX90N08dh94Uqj2+G0HwJD4bFLbbwz Qk9Ypt/3KiIqJYSKjrNAID92zr4+Jcxzp+oEUXRUK6KsnpKDVqQcwaJ4ycHGQZfLiOc5 RQUTGopXhGglvhQzc965LInAn3fB/J+tdS5NjRjlx/nvjLw+1Ace4fLapYSMpULJsdOv sfFg== X-Forwarded-Encrypted: i=2; AFNElJ+TPCsW2UHK4vuEByRdtu7tNIlmhGRAvEAQWH/SWaCVP4ZF/7//ZHjNNiY/wIrczEc7mMqpCfA=@isar-build.org X-Gm-Message-State: AOJu0YxcEQuts/7mYFAIz0vS5HLrCSOZpXiInN6O5mfpTRZvxM4OKS36 mkidjcXCm1KZwyQ2TrytqYselKK+SVJAAHf/ESHcEuyRxJ5hRZ2g3Wit X-Received: by 2002:a17:907:72d3:b0:bd1:ba57:ec8d with SMTP id a640c23a62f3a-bd3bfda88b2mr466273266b.17.1778750386356; Thu, 14 May 2026 02:19:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AUV6zMPDtOTLqExHM/dIm6eEafW0ysEr1zji0OYUTNBNO8ZIfg==" Received: by 2002:aa7:d1c4:0:b0:674:9e31:885a with SMTP id 4fb4d7f45d1cf-6833048e333ls516296a12.2.-pod-prod-03-eu; Thu, 14 May 2026 02:19:44 -0700 (PDT) X-Received: by 2002:a05:6402:31a5:b0:680:1e7:cfa4 with SMTP id 4fb4d7f45d1cf-682580b558amr3069172a12.24.1778750384338; Thu, 14 May 2026 02:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778750384; cv=none; d=google.com; s=arc-20240605; b=kP8V6sDwASmgkS6ZRPONNqPYig6TkAvkNjmUIyVbM+MFFAGUzkkkjTRmv9uANZjPc4 zsb/z4VxyAdpVeNw70HKFz5h5HYedyVVtUhyeksU+0z0Dn31maUUInLvk0vOXPxCDdn9 Gi52HQgIKdwTh68EdvrysheJhWXCZYFnt0mE4wo40Z3iAo2WYUFWlBsBe3tzvTZ4cka6 t/SD7oefeBmhs9QGFvYJ1comkvSo3q3dLTc6LvtPo/eyuV5XY855e5soWNp8SZ8wgONe zVMSNankprk3hC78vDqGneBJbAer6qEHewKhCwtMzjyH5CpchTxKeQsMnRKiYOcu+YEU omyA== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=syE2KDor1weOk5kmvEfTPE+1C/Z3zhHxi/Ivak53rXc=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=J3oBhfGbPcXT4I2XlSN1iT3bUZGRjqyqn09N9q7qJyGr/wl16aUhW9mFGxXWy4A3Oo gAH+MMTAiCTXzkPz4dOIrHe7R7GVpyo9u7cJKzWOiD+sTwLuWQ4kCnXc3epc5rzWQww/ 7SjiWIK4Qc2xJEUSpGFYO0fkUAHPGRxLlIPSfqqxE44UhcMdJwqIi+skzOTycECmCeTL 3Rkb6cXaBh2rhjBbXvMvD7BFng58jv2YhRRCJV21J3BCIf+vgy6i8TIDeqEymwy1jI0p pzZwOQldI/Ewp2b+JJxWx+VX/YBFZWJV+kjMu56vvoMlR2rI4vWooG9jmX/7pgReGJti Iy8g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=it30catw; spf=pass (google.com: domain of fm-1328757-20260514091944e83a43279d0002072f-e4ol9z@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091944e83a43279d0002072f-e4oL9z@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-68311058e41si41827a12.4.2026.05.14.02.19.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2026 02:19:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-20260514091944e83a43279d0002072f-e4ol9z@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20260514091944e83a43279d0002072f for ; Thu, 14 May 2026 11:19:44 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v2 4/4] installer: install seprated installer modules in recipe Date: Thu, 14 May 2026 14:49:48 +0530 Message-ID: <20260514091951.1572682-5-kasturi.shekar@siemens.com> In-Reply-To: <20260514091951.1572682-1-kasturi.shekar@siemens.com> References: <20260427063957.603123-4-kasturi.shekar@siemens.com> <20260514091951.1572682-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=it30catw; spf=pass (google.com: domain of fm-1328757-20260514091944e83a43279d0002072f-e4ol9z@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328757-20260514091944e83a43279d0002072f-e4oL9z@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_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: Kasturi Shekar Update deploy-image recipe to ship the newly split installer modules. Add the following files to SRC_URI and do_install: - sys_api.sh - installer_ui.sh Signed-off-by: Kasturi Shekar --- .../recipes-installer/deploy-image/deploy-image_0.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb b/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb index 44b96c27..dde92eb4 100644 --- a/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb +++ b/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb @@ -1,5 +1,5 @@ # This software is a part of Isar. -# Copyright (C) Siemens AG, 2024 +# Copyright (C) Siemens AG, 2024-2026 # # SPDX-License-Identifier: MIT @@ -9,6 +9,8 @@ MAINTAINER = "isar-users " inherit dpkg-raw SRC_URI = "file://usr/bin/deploy-image-wic.sh \ + file://usr/bin/sys_api.sh \ + file://usr/bin/installer_ui.sh \ file://usr/lib/deploy-image-wic/handle-config.sh \ " @@ -19,5 +21,7 @@ do_install[cleandirs] = "${D}/usr/bin/ \ " do_install() { install -m 0755 ${WORKDIR}/usr/bin/deploy-image-wic.sh ${D}/usr/bin/deploy-image-wic.sh + install -m 0755 ${WORKDIR}/usr/bin/sys_api.sh ${D}/usr/bin/sys_api.sh + install -m 0755 ${WORKDIR}/usr/bin/installer_ui.sh ${D}/usr/bin/installer_ui.sh install -m 0755 ${WORKDIR}/usr/lib/deploy-image-wic/handle-config.sh ${D}/usr/lib/deploy-image-wic/handle-config.sh }