From patchwork Mon Jun 8 05:17:32 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5112 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 08 Jun 2026 07:19:52 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f62.google.com (mail-pj1-f62.google.com [209.85.216.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6585JppA028709 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jun 2026 07:19:52 +0200 Received: by mail-pj1-f62.google.com with SMTP id 98e67ed59e1d1-36bba9b849dsf3819899a91.1 for ; Sun, 07 Jun 2026 22:19:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1780895985; cv=pass; d=google.com; s=arc-20240605; b=Rj4WNBhf0Z4CSnSQ4FR+/KZCIY6PJajU0wB9hqrmMP6iIrtBWncIgARqiUOTnfBbh+ MC0WTz/L8T6HEbLk0P8mdmR+pcktUjYnKgP2T3unCBkGlGnfplkgdPKN5cj3K1rWgLiZ Vt66E0KNQpJbBw4zaS3sMDaMQBLZNy+c4gHOhmCZE5GQsi+J99dPTIC5GhsE14vPd3DB BmtXPtt0n9G8ohCqwFUZf+hXCh8WeLfBfU+Ubsgk3p82Z01iOb8p/fj+gUsk7CarmrWt AY60dl+7VxUysnIWYxVaJg/ce41OMbUbZZyQ/0SCIx6tWJfieTs7HjHqmp3htSBOpjkY B2Sw== 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=0eyt0ESrKP7Ruwb20G3kHEndLNbwFtKVgBdvboEpmmY=; fh=hlJjL7gviDx7Arj6QCHNNEPUpfF+Yr05buxc5L0oH6s=; b=O5INi5wiM/Htf8iTedgjCZtaPvMYVnHed0eFHEtMDDCiLg9Mng8S4El9MUkiFNgCza x/LOXVNMPB7jvRPhr+eKTp7T26oHUEWDyZobM3kH2t+rNSioUvKIeqytwS7i9h0bxJLO 5lMfTfoC8w8qFAdEzccKT9x0xgSDfCIq1G2+axoqGJXyokS9gyBcuTTZUEOz6BBLRGb7 nzgC+85XO6MK5Ij+DmaZbJvdnpvsuMGUZL5RJ0NsF8ZWs3Vc8iWzJ9Qh8Y1k6Z5UWmRG GWIpd+wY/Y/SqKHFXSGBhG1cG3AKvep/z+gk+Z8jzkv/fCB1juHy19MtEIo14Zi+6MKL P1Pw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=E+HbJvc3; spf=pass (google.com: domain of fm-1328757-20260608051940d74c8afa4c00020770-q_qju_@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1328757-20260608051940d74c8afa4c00020770-q_QJU_@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=1780895985; x=1781500785; 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=0eyt0ESrKP7Ruwb20G3kHEndLNbwFtKVgBdvboEpmmY=; b=fTITUXJ3LUYYPyA6pcdAhvdYQcoWixeh4N7NOyx+GAuMtEOurfWv/O5DPltv34aKNA Zz8OvypqHJj3a/HJw0I8P/t2OtVNKq/x9R21o+5R00Kzq2iZRNIy2bviJinxKQeRdzdP h9iphbgNtS8WcmklxRg0mSa69RqrFnHJJopH/4EHzKWELqBGs9FBUdNgnVqjW6XbDwqX lp2/0y0aPyB11FNWMsWCbnu7LdC7lKBxeLCpBLa0GOZcvOiJ8zfGzVCJB89nIHY4lhuk 0Gd40O4BG/y71vLtsNxdVTbXbFraJM894kEcQ5ByeDjKctIZXKzUB7guxydj9V8Wfahl wRGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780895985; x=1781500785; 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=0eyt0ESrKP7Ruwb20G3kHEndLNbwFtKVgBdvboEpmmY=; b=rtyZMND6ckLu872xsCaV0sIY37wF9F2ezaFXz6jN02gze7OMDP6SmFwUiFPPeHJU7w VNOu/+/NWkiONlTp7NM1LN+Np/Uqii4cGHfgCB+42QbVP100TOSmrWo06OQVp6ip6XAk QHhTiN2vI8UPj9LUqc6gFoB1KjhGzfjBWDKu/A0Rck461njatytddAM+YNOijDEvMpgx oWdjGEbh5/H33nUPC1mc/rmtLaV92g8Kwn9RU4FkvZnU3LjBZDd4fEI/X8ZN3qKYVAjX iPByP+TNRP3FdoCTBP8OneIne2Xxnh+JoHIscEL8xYjt/GHFoVoVwjuuYeWHyLkkamGA Wt0A== X-Forwarded-Encrypted: i=2; AFNElJ8PvyKoEMfmFLFyzO0O/MinzWMsyJ1QrOSMwD063qKcYUVNXbgtcbKMrrLf06JZUt3nFNczSjA=@isar-build.org X-Gm-Message-State: AOJu0YzngERhoA/6jgN9anXyHsmBuMVtbxhztYu33TRrRcgksVkh4dst d/2Z2ed7Fh350LUcC0fX6ReXkSWe6WANAL2NErBQvZYu/qIOUXDYo45l X-Received: by 2002:a17:90b:1809:b0:368:6998:b49d with SMTP id 98e67ed59e1d1-370eeff6b37mr15395411a91.10.1780895985160; Sun, 07 Jun 2026 22:19:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUeywf/JrAZq63nhsYdSUJrrSEYQ8P1JGO+Os4t17cMJ/w==" Received: by 2002:a17:90b:48c4:b0:36b:74e9:20e6 with SMTP id 98e67ed59e1d1-36f65d418e7ls5497579a91.1.-pod-prod-09-us; Sun, 07 Jun 2026 22:19:43 -0700 (PDT) X-Received: by 2002:a17:90b:1809:b0:368:6998:b49d with SMTP id 98e67ed59e1d1-370eeff6b37mr15395288a91.10.1780895983143; Sun, 07 Jun 2026 22:19:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1780895983; cv=none; d=google.com; s=arc-20240605; b=IoySjSwHa+ViPLeWHoEvoHgv/KJ/Pg3XH8tqXsx07BY6cFPrSk9TANDBBsla30cmmO pWV05xN1ZHrnuET8iMxundGwPmd5Ft0Gg+k/Oe+PyfYABJMiFp1xynDtZWnBbIMiwTjZ Gl5TkY8qP0uoKVMK5giMOBJ+dzBwI3ttmus7tZaK+kdlgQmSdMDPF+Eqf7uKuBMu+ZCT hL6J+yA7MCQdnJQwLQGqbsCKVKYPlfrIoGvrm/GQ1Q+VqbTovXmkpZGFCkM7ZKXr3ska pMg5V8iXpaGUgoa36GarhBNFOAY1zeOtwBhElyNy0HUXhZO6H6a89yMtl9t5a7q1y1M+ mofg== 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=QtfVv1aUxHY7Y8Llwlr6a9Y3Nepoh6tvuQjz3oXxKZKe6MQ6hsQb2t8t+RdMbgHp0L 5Mxva1LCuCPzdh68yespUW+rjaOWJMoz7lm6g0LAvXcMSySXUFo62a21u8YSaCxX/5o6 xxbk23xPM/9g1erEhaTeSURT0BR7Dy9YPS6Qm2jeG5DBhp8RHho0Af+49IGobo+76BuZ BeSij56zVXJNK2HjruCgnpwu8C/2n7MZbCQ7PieQN7W5wmjc1sGbdH4o6O+r4eME402C 6VEsa0hlL/7445Jdru+dyLFbRDuDyrBqSdFUmA52b+cBR7FgJ4t468QxNzXtJ90MfS8D 3qRQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=E+HbJvc3; spf=pass (google.com: domain of fm-1328757-20260608051940d74c8afa4c00020770-q_qju_@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1328757-20260608051940d74c8afa4c00020770-q_QJU_@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-37135d3a9efsi118027a91.2.2026.06.07.22.19.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jun 2026 22:19:43 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-20260608051940d74c8afa4c00020770-q_qju_@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20260608051940d74c8afa4c00020770 for ; Mon, 08 Jun 2026 07:19:40 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v3 1/4] installer: extract backend helpers to sys_api.sh Date: Mon, 8 Jun 2026 10:47:32 +0530 Message-ID: <20260608051737.946413-2-kasturi.shekar@siemens.com> In-Reply-To: <20260608051737.946413-1-kasturi.shekar@siemens.com> References: <8b658081-ce7b-4ffc-b108-1691f5a8ceaf@ilbers.de> <20260608051737.946413-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=E+HbJvc3; spf=pass (google.com: domain of fm-1328757-20260608051940d74c8afa4c00020770-q_qju_@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1328757-20260608051940d74c8afa4c00020770-q_QJU_@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 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 Mon Jun 8 05:17:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5113 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 08 Jun 2026 07:19:54 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pf1-f185.google.com (mail-pf1-f185.google.com [209.85.210.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6585Jqv3028730 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jun 2026 07:19:53 +0200 Received: by mail-pf1-f185.google.com with SMTP id d2e1a72fcca58-84233efcaadsf2663914b3a.1 for ; Sun, 07 Jun 2026 22:19:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1780895986; cv=pass; d=google.com; s=arc-20240605; b=jdvgWhfLtvDPDvtG/AgkAC9tGcR5fZT13jW5JRoRT3wlSr5xW8trabG6oYiAiiwhlr GqbG1jPqLt55948ZcSVzstpkhZYMysr/N+OHBq9agZGQgh32xc0Dw3GVNrpyW2XWdUKQ osQGGlTx6/SDGCY027J7sXX0ojWhhoXZW5FPaasbZRPWtejJVI/HqdEpmVdHsfheT42C wjDvLhKlg7KNtoN1r79gn62segsWGNFIQhY+Y1uQhr2RcfXP60R4/cLMWpm17vwI8u9G g6X/cJsbK/n6KyOhrOc7b4xm6290EQRuSYw/DZGp4aUvO6JlhQyjFjGdkJa8grgQhY6I XLmw== 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=AH7IJhIl84+WWLyMRh3Zr/MTar123JOnWd/rqpQ0tPk=; fh=PA7lPSmjv6cLiR9mJJySE7V6AaaeLBiHs7YtOOq3OyM=; b=kCHyajR0ydEtRM8DFCC7S4ORXRCCEw8l/V8yJmWNRDdAn0ArT5wi0bThRV4NdqduBb wzV7If50axrFX2/7Oqwwm6Xe7TPPPjOphHIxy0ioTxKVW42SM/xQIEJX5iX57TFIdgPd iKxP+aXnbUNI8p1mD7ePG/fhFSwySvRqYhUNgjFjR92X4xo24+TTgOLXTC5zNnUk1O2y 9k0Kw6yLz0ml6TFEOH03lKLL4RVM8sxsSEM1gVzM3qVREGG1dmYxcG/AtW7IAGK/AqUQ T5l5e2vAe19yc95v0beGgFd0nCKNyix//MjmzLkTpCkH4g3JOY/cusrwP1GmJhrKgHRV cTgw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Pwd4IqZy; spf=pass (google.com: domain of fm-1328757-2026060805194353b1824e4700020751-x0cbrw@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-2026060805194353b1824e4700020751-x0CBRw@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=1780895986; x=1781500786; 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=AH7IJhIl84+WWLyMRh3Zr/MTar123JOnWd/rqpQ0tPk=; b=pmtjC3N3lJtQp92TRXoI5GpVYgRsnNJ5ja7bjcSHRCKMesZWSv8ZDNCCe0H0Pwnc/J BWZ81bXQmDwWLATUzVlWQMGZ8kKrqsEv7PF+l+RO2a6/+1iNaLSQWdYjlKY4gJ1GN8e0 IAF1L/jGt61EWLh+K+mstSuz5t/f9mjjZYaNN82XxfR4PqZ0x9myvXkiD3fU/Z6rAL+t ibs+vHknOHwa6msAj74u1vI3eOJ/Memfef4u6eaC05i+vev+kWW38k667/1zBOyJZQH8 u65oqCEgWkj/bxV9w/1r7HeZ0vuWQe3EjFpaHCgG7ifNOwzNWx+Nw9vLrw1sF89Gq793 skJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780895986; x=1781500786; 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=AH7IJhIl84+WWLyMRh3Zr/MTar123JOnWd/rqpQ0tPk=; b=jqf0xs1NdOrMkjmrwtTRBfIn/IppwsU204l+WgCejOTdQ9GhW4baFMhkt+TvLa9xdB D/67WfBZKy65iz6lZc3vzPpaiFArraIQIMFf5NI3EHVjiE9JUuCc/p4ZD69R55qLMw2x BHAm/sdSh5mEkW9xPXD4qjolSOh0bUhHKSLU/XdhTiD4STsNSKZ5yblgUDrWSh+0tzSH AMVNLsHbuWfHAzOQsdXrdU6vZderJ4R0S1NNic6V/RbNHCNR5zmKw8eCiXWDdA69kP6X 4D4mbz2/JDubFoKKPg6/YlVz3UCQT28237SxeGi2ZhGZSxx59Ed3uT/O83m6X2CIOMt3 LgCA== X-Forwarded-Encrypted: i=2; AFNElJ/YgXDh04/pinbkyAbOLWOUacJHlGDpengpLZyda7LSjPatwCOFTK3gJRlR5LkaabyJqLQK2FA=@isar-build.org X-Gm-Message-State: AOJu0Yzxk6Iqs61dsNDYqRhJ5EMj8yhp7EnD/6ylkZBxVZ69ipXnM/Av khrA/2IHP3A84Pn+EE5OUZm3IDca03JU3hoMakT3A9Lf+LE9+jzwYoJX X-Received: by 2002:a05:6a00:4510:b0:842:6e9f:9dc with SMTP id d2e1a72fcca58-842b10b308bmr13303746b3a.34.1780895986513; Sun, 07 Jun 2026 22:19:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUeShhMF9B4/IoghGB0zqTkPiu+6y5HvCrsmB8MEOUz/cw==" Received: by 2002:a05:6a00:a8d:b0:82a:6b57:a7a6 with SMTP id d2e1a72fcca58-8429cd3a247ls4361483b3a.2.-pod-prod-02-us; Sun, 07 Jun 2026 22:19:45 -0700 (PDT) X-Received: by 2002:a05:6a20:7490:b0:3b2:86c9:baa5 with SMTP id adf61e73a8af0-3b4ccfdbb5dmr16955088637.38.1780895985027; Sun, 07 Jun 2026 22:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1780895985; cv=none; d=google.com; s=arc-20240605; b=IFNWqD/WXWMGnwY+yVRBYG2b5A/OL+DFYZqeWKECjvg2MbY6VEbEtmgh+sSD7qMkQc 7mcn1W2pqS2hWDe7eX/1Ir5Tihj5bexL2fr306mc54iyFWI3kGVTM4C6UadhuQTXnxvH btqqOELGKJnhp8E5TQ9K3VRDf8wjvVRL6VjLCAHR2UWkieomI9EJisNpgpBzu4Ox7ARO iT3KZC0nTK+BKae4W3RYMzxUeGDeAM/yNcCkCT8jKrLo57UFPWWUmqyZbVMZZMlRNhoP MXnmPdNwz1m6IJUOcxYOnX4RI+UFoykqwa2+icEoBS4SxNEirOh1nN8TibWUy5r6vNez /IEQ== 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=JOPj/2SpHI5mCwJ4ZFXUFOnQUw/cXig92PN65zTEifKlaZlZJlnuYrS+7UOFPp975w kG2t2PV5X8hDCuyJVWKKuD1yR5AKN0bzq40rzCNP5QQdI9rGjm4zNOqzCk+oUQcPvplv eJXztX5b9jQbSkFllbppKyUsbEmg1pgeZShDYy6UTu5yeUq5U46QRpzM9qr/0k0qQO/B 2GgTJCZCWFFDQ79ncb1uKnMIkMBJ4RU0Or6ZdpnY+b/sRp9D1G92f5prFj98acHpyoK6 c01DAEoP3BkceJR5f8nJA8UUPvwIgugiqpRaujpUlEsd6/8wI3z1rRLNUpS6nLP5PF3V bMTw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Pwd4IqZy; spf=pass (google.com: domain of fm-1328757-2026060805194353b1824e4700020751-x0cbrw@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-2026060805194353b1824e4700020751-x0CBRw@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 41be03b00d2f7-c85df08cc94si474019a12.6.2026.06.07.22.19.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jun 2026 22:19:45 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-2026060805194353b1824e4700020751-x0cbrw@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2026060805194353b1824e4700020751 for ; Mon, 08 Jun 2026 07:19:43 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v3 2/4] installer: extract attended UI to installer_ui.sh Date: Mon, 8 Jun 2026 10:47:33 +0530 Message-ID: <20260608051737.946413-3-kasturi.shekar@siemens.com> In-Reply-To: <20260608051737.946413-1-kasturi.shekar@siemens.com> References: <8b658081-ce7b-4ffc-b108-1691f5a8ceaf@ilbers.de> <20260608051737.946413-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=Pwd4IqZy; spf=pass (google.com: domain of fm-1328757-2026060805194353b1824e4700020751-x0cbrw@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-2026060805194353b1824e4700020751-x0CBRw@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 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 Mon Jun 8 05:17:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5114 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 08 Jun 2026 07:19:55 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f60.google.com (mail-pj1-f60.google.com [209.85.216.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6585Jr4h028733 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jun 2026 07:19:53 +0200 Received: by mail-pj1-f60.google.com with SMTP id 98e67ed59e1d1-36d985df4cfsf4564309a91.1 for ; Sun, 07 Jun 2026 22:19:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1780895987; cv=pass; d=google.com; s=arc-20240605; b=Q5vmMIMqc1DqfPo3OZzrIkXLeONt+M297lRgAQXNj5H5v3VbKpiaKxyHihjqUkSyOV I90r63pxOVWK7YgbGoc20q+ISZAqXUGxnLmB743dAwWezE4xyQ5ZGS+W0eS5PE+1Iu/V ancGe5PzT1BagfQiinRePxVlgVzDfvD2DgxYbohVfoPgwNfNX4blyU+f1M9IZUM5LcuC kGHixlOz0ZoyQGbYfAsYfraJg3WHjf09TrdobNN8jcVjhzS/Tg2rKm/KoEMAr2pRLJ5R V7KIGM8XUbaRrMd533P0Bz63kkyrOhkeRSv00CHn7KOat/wl0cOQzkb/Hk28qga0u9wy JoaA== 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=7e9h+edKceKNStXB3Pj7ATOEEbL0Yb5/iJ+H/yfazDI=; fh=Rm24FaEg9V73Uep9MydwUl3mOp1qgK4inV/81wUCXeo=; b=QKuPvWIFkJ5noHJYirASzq9KlVyzxCep6tsXRH72gCI8RjV6IvAgw8qWQH8kHb38CD //air4+MIRbb7ehsaMR5/RchrZ3SXYhgwJOhn7u+Qt/3ZRRhQ9LXhTnnZ1Z5TAzysOSJ trh9myCScMth1eb72hOIJZGNHpE2Um/0BaUIO8xCnbgOMGCOSyDCA427spj75kqeJtRo tZzmTGgaBQVjngqDdnXSf3JAmswg/7falmf9ZosgkCYpPLhPcdH2jXKJNhQAzHyQBd/8 zE7uIkjK8s7qceyZ1+Wwc4IFILkU0KXTt9iu8V3+OowUTiYUrPF53SfxQwZzW6sviCD4 h16g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bqGEFLon; spf=pass (google.com: domain of fm-1328757-20260608051944f3346e8ccb00020757-xwfj_8@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-20260608051944f3346e8ccb00020757-xWFj_8@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=1780895987; x=1781500787; 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=7e9h+edKceKNStXB3Pj7ATOEEbL0Yb5/iJ+H/yfazDI=; b=akG1Fj1UKaeJUbuNpFAQXOzHPt/1HYgF34NfWrMOJczH61TX+Ht1BvT5F3RW18v7xE OSLudyCAsTacX47kbDi0+An90vW0U4cwI2/CsRHzplXf3E5tSkxnkVzpeRrTK6ac42af A33rUYcqubLfLj4vL61Vy1qNB0N3Y2Nte5iAqikQsITaXNYYCraymTAzF3Tizav//5Nx PojDzzNQ4ULbvhdj8JmOzlQ07BFZftokAAiGCypb4EKrQfz7vtFnJ+iJ8BhH3mG7z21Q O4hrOsVtFSp45pqgDgBxG6DoKmNVfWZ9w7nEBQcnXgz8tp123rwifq8LoUo2kv1bAR93 HTFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780895987; x=1781500787; 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=7e9h+edKceKNStXB3Pj7ATOEEbL0Yb5/iJ+H/yfazDI=; b=T7bZizJrrZwiiZEW21EFicXet6i/szodz1v09RWujxJjshy0xkhKG2unK7B8y6Gp8J VJiAtJE4WQhtyx583jbDUNTYNJ7OduVhEEqG1Kk9Oth2b//XAyu6bgZO3Rz26nCMF3fZ /a6p0L6f9r9vOiS01MP4ujkgRtQFRnJhJIQTefqjgSNaOahHwegXs0MRjvDAvTQ163RP QjyZO05F/crGlbz2KcAKG+9xNOkpbnsAmXAWoIRr41pGq05D2k85kgSXcNRSw8McHIwe lB0jqtepn2Inf2jjzQo14PnlK58etNbYVnU6gXwoEQ+HPhVCVnY+wdwiGXeRaSF6ggN+ djww== X-Forwarded-Encrypted: i=2; AFNElJ9waFi8P9MgZKLSuy+mXzrOxrQBY1l4vumhb9jAmkquj2BJjN5tGkwAHO9e92eAqUnDea8Ik+c=@isar-build.org X-Gm-Message-State: AOJu0Yzrnp2cLGA73SH6NHYNvQs7pk0gqtibWlui2m5ofbAfT8H+iZcl BXssTg82HmGDMeU9KfOqA+jniejYOiEJgBkEHm7UCWW9MkQW4PSHgmKz X-Received: by 2002:a17:90a:d606:b0:36b:5b82:4834 with SMTP id 98e67ed59e1d1-370ee547414mr14549686a91.7.1780895987401; Sun, 07 Jun 2026 22:19:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUe791nYyem7ksE9+tw2y+XagnQxG4MsusA6MlGoeXAbng==" Received: by 2002:a17:90a:d450:b0:369:ab18:5f69 with SMTP id 98e67ed59e1d1-36f6880bc9els5473698a91.2.-pod-prod-07-us; Sun, 07 Jun 2026 22:19:46 -0700 (PDT) X-Received: by 2002:a05:6a20:488:b0:3a2:7ef4:81df with SMTP id adf61e73a8af0-3b4ccf8e762mr16565064637.26.1780895985716; Sun, 07 Jun 2026 22:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1780895985; cv=none; d=google.com; s=arc-20240605; b=Op0NFHw006Q1hFgjRdj1OzwQR8nhNr2aGbGEVCbm/Joh7qgYtWcctDu2/W3x651Rv5 XHCxEFTXxbu9ZF41Nd4Op3vYXCGiy5zDKY1fxrKNuYZ5iBcxvfj2XBlNQ0cyHx8VWpp/ nuXB96T8pFcbH6FaZml6rx9PF2O+NuHTOjpZMIP0ElmRdOwE5xiLnLpQhgFh9KPHk8m4 R7l6ZIrOaNmSLVdPJAZJslorx2RRbQYspM6UcTtD1y2PsVSb2Mr6dyE24JFkPxa/dzSW N7DPPun2Yf+carz2O1q+tDQvVNCiOYtMR6m5N67YZM2ZYo+xdKGJMGmXaOdKT74ySVnS 52+w== 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=cTeXQzUlT+fpvSNc1N3F5VVoHWEeLW9rrilhdNW4MfE=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=cvwWMKXZW6LuFebzprVkhCxgXav3bCIy1EaM1Yi1N0GgqN96/NMugNV+I3hmzeJcd8 Gw7NySXuHkSKH08vbP9L5cRhv5PIGRzKZ1mC68hR/XvEekFaL97XnoGnaCUqfoG8OSTI zvzJoF4tOhC74z8zzpmNH77I+nZFRUOA+saAPuBJsHXDUTUl8Hbaug6rS/4jCG2/DiVf LVlearW5d92LMIROxQdHxa+Lh01Tn/jtCOIuhHirGst7EqMHRfK2bQHddwNOkCbYRwDm c10QMR4RGcMif0eGmVc0OGYMFbE3D/5CLnbFZB0etefmxAOLkL1TSs2XfaOS0C6W77iH uvRg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bqGEFLon; spf=pass (google.com: domain of fm-1328757-20260608051944f3346e8ccb00020757-xwfj_8@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-20260608051944f3346e8ccb00020757-xWFj_8@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 41be03b00d2f7-c85df08cc94si474019a12.6.2026.06.07.22.19.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jun 2026 22:19:45 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-20260608051944f3346e8ccb00020757-xwfj_8@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20260608051944f3346e8ccb00020757 for ; Mon, 08 Jun 2026 07:19:45 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v3 3/4] installer: add installer flow module and entrypoint Date: Mon, 8 Jun 2026 10:47:34 +0530 Message-ID: <20260608051737.946413-4-kasturi.shekar@siemens.com> In-Reply-To: <20260608051737.946413-1-kasturi.shekar@siemens.com> References: <8b658081-ce7b-4ffc-b108-1691f5a8ceaf@ilbers.de> <20260608051737.946413-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=bqGEFLon; spf=pass (google.com: domain of fm-1328757-20260608051944f3346e8ccb00020757-xwfj_8@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-20260608051944f3346e8ccb00020757-xWFj_8@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 | 472 +++++++----------- 1 file changed, 189 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..42107d16 --- 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,199 @@ 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 selected_image + local selected_target + local target_device_size + + # In attended mode, prefer to ask the user for the image selection. + # Only use installer_image_uri when it was explicitly configured. + + 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 Mon Jun 8 05:17:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi shekar X-Patchwork-Id: 5115 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 08 Jun 2026 07:19:56 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f57.google.com (mail-pj1-f57.google.com [209.85.216.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6585JssV028751 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jun 2026 07:19:55 +0200 Received: by mail-pj1-f57.google.com with SMTP id 98e67ed59e1d1-36bcfce8a33sf3823178a91.1 for ; Sun, 07 Jun 2026 22:19:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1780895989; cv=pass; d=google.com; s=arc-20240605; b=g6oI3HJCQyK8a7ChBGq5LPhTgR0Q2foZAif0QNAkFLIYnA0XSWTy6DaFTZGLzedybN q/5SpeUw/+/GGT/TYmt5b8QSo0Gh47594TmCcNiF+E9U+tKIFbI4GQaOF2sg6FaLSKPG UTleQ/qccxTeRXRHH6XzdiuaDs1oxxxryDpHknMNwy5F9+v67eGPbPg1hnlUPGBzO6t2 MFdti9VJC7pxBiPnMOp2zIB485+uEOLEwIp1NhrOoBTXnGj4d9l0X/M6p/yESZ4cbDIk sqV7qjCbHf5awuRdFqElAtIsqdELzXHdqb7XttY5M9h3FahNWa8RVFiMU9QSio1kiPSX Tdjg== 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=QjhSMOMiQeYTGbYbS5Vr8/TM47cU0TMwTlqjW6ilsGQ=; fh=bv6g1ulnYXmLbsVNIn4M2PpOhwscnQLT91NDLhNPyI8=; b=S8tZnHjc0Vgjlrd3+TVwG3UP1jZIcv1AmzgnmbIAyzwUG2jLTtrV/S+pXsO1MhJc7+ DGUw+oN1FWFj93zr9hSjMh0CV1tA47mkUINexeHvrsnl2cpVvYn87ZbnH0BZ+hS0qYAy 6Ifw+awtpPJ7ijIJ798pNDt1Onu6GHUqQRRTp9eW2eU4CnikhPlrh70q0G78b94F7pB+ KZTupJLfoADe3J82RyYlth5yIcIdqN7UwMr+QPXeFSSTZ4GVt3vA3oSmsoz5AYtoyPjG VY0lpuKZjC2rq/balEW997iyVSPDO/m9JMrxGOb1N4BcQiF/5DKsDtIqK8fzAKWy+ceq 6qRg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DoOwYAdm; spf=pass (google.com: domain of fm-1328757-2026060805194656d6e03174000207a4-h_wl_a@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-2026060805194656d6e03174000207a4-h_wl_a@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=1780895989; x=1781500789; 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=QjhSMOMiQeYTGbYbS5Vr8/TM47cU0TMwTlqjW6ilsGQ=; b=wMnzhXWaBx+Y/QLiWoJCZrdJIoVUqU06v/zJKKM/mC/N33IYrefSwWOXRN4NS4yq8C YGuj0ZGSrgflca6YYnQ55kozc2+sCeW6DmbaIaWGqOeYYU5qVKskQw0MzgOnwCum2oYo PXdI3TwnPNa2IPRFo0W7q21gtY+vhKrSGYfnS5Tqgp/mx7wVztsc8s3Qv/aSPoHPGOLx yRsKAAz6LB4p7zRCIwdtPA+ficowhRoVH0/Hy9X0PKjf8bJdZFc2tnKB1+1uL4ankF8I bMBO59wrQUEcC5hSv0c4cZlz7Zwmr99wTo+GRxhSctN3omOaaHB9LkVM9Zes+d2nKPIx 70oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780895989; x=1781500789; 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=QjhSMOMiQeYTGbYbS5Vr8/TM47cU0TMwTlqjW6ilsGQ=; b=PyMYM5NbN70h33IK82mDWmHcEqlccoBTeHmJlJ8oSWDF6ozw0XMUvZIPWABqOMXahd uESPTiEZHyaHImcx8q62guV4ZBtWckzz+rz6XrjQaj1WOfKoVCl7QG7tk+kKMpBkjo8Q i6h2MdNKFl0ybQwQvUKxY5MXpWZ6VGnLHbQRJA+JzdNWgCAH8HRvAB4Z3YHraZERr/Xv aTNHarSrsFIG0sRn9WG7FVt0/0ZrvvFizigfykFd/fSjrgRav1NsE1qSsFJOM1kW18ND x8Xqz+rF4cwMi6hJo5Wsp1+zH4FKPpxBoq1JLaevbbTGaOXlNOKyUUJbqk+n8kUfCtda 21sw== X-Forwarded-Encrypted: i=2; AFNElJ+L3eGIrdnCdRimPf4wkDHKMuLie5U/6ywCH3QaEIfcNEJSQA6Mfc3SCCnAc93hRXW1XKpanGE=@isar-build.org X-Gm-Message-State: AOJu0YxHrujRrSH8gxWzq50m9K3/FGKaa5qeIixDABepf/jF4DOE/4Iv as8FOOAWPXeCvPkQ86ZZT+4ejwdjsoG7AdLkLXbC4VUEeWsQ8D9/GZMG X-Received: by 2002:a17:90b:1f81:b0:36a:5b56:5c1d with SMTP id 98e67ed59e1d1-371323bae7fmr10660965a91.11.1780895988873; Sun, 07 Jun 2026 22:19:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUfAr7M7jYuJXJ0rFNbvTfuWP21nbEEZbeP9qpoyFaITIQ==" Received: by 2002:a17:90a:db50:b0:35f:b642:5671 with SMTP id 98e67ed59e1d1-36e0e7c5bb9ls2068943a91.0.-pod-prod-00-us-canary; Sun, 07 Jun 2026 22:19:47 -0700 (PDT) X-Received: by 2002:a05:6a21:a8d:b0:3a2:c9a1:2c26 with SMTP id adf61e73a8af0-3b4d39f348bmr11790520637.7.1780895987403; Sun, 07 Jun 2026 22:19:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1780895987; cv=none; d=google.com; s=arc-20240605; b=BXNf4E25B1CGF6bYjot8OzaAKKdMNx/54Sc3b6RTuFwMsSrjzwJwN+pVvPv+a6K2Ak 9t4zd7EeNSKKpSdvB7ExhPUxn113utRpZVpxnbYGFoL6ZPxDvxADbt6BxPVlfKFLT5pS 0ZPMj92oBK5d91BhOmhz17GqVBWhTARnEzjCZcg8ODWzunM29nNEMy0MNEbGdWMpzrch ZLoMGWDdr6lsIE/0PSzIjH/RehF+dE4brI8WGU7a9SEEncqjsGz967f0spKl+a0bZ92+ 10TdBsh7gJyXIXEBO2CCsIHSyUQPAbrHo0VcMttYdysAvt0WAO4h2PQVpMalpDcqs9aK V1FA== 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=CE9mMK9JY278MjdFNM6MY/Xj96JGPVis+MKT6TSTjPh7tZNkmHbK7piV2BSoLWJUEa JPm0XvTIC9iIDG1O4pSWONi5Tbkg+C81CBWUm/ezW8lm1DTejnXHPFm7CbxUluJIbwTO R4jQH0IzL79EnwO1493BqYjqUNXSLbk8vPNHsBE1q/yy8ogH6FZMNPDu84QGjA+RtVg/ M8ivDIopDAC/uD5TBm/ftLQZTHsz7fiQjpBPBuK7yuYYg8UPISvmnJvu9nvZ1K9Phlka 77WV7ZCsJZf8YzCYd6oMcnNIuKgQrn6Th/YNJyzYb2TQMmaaH25e4NW2mgiG/SBX8E/O 2qZQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DoOwYAdm; spf=pass (google.com: domain of fm-1328757-2026060805194656d6e03174000207a4-h_wl_a@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-2026060805194656d6e03174000207a4-h_wl_a@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 41be03b00d2f7-c85df08cc94si474019a12.6.2026.06.07.22.19.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jun 2026 22:19:47 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-2026060805194656d6e03174000207a4-h_wl_a@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2026060805194656d6e03174000207a4 for ; Mon, 08 Jun 2026 07:19:46 +0200 X-Patchwork-Original-From: "'Kasturi shekar' via isar-users" From: Kasturi shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v3 4/4] installer: install seprated installer modules in recipe Date: Mon, 8 Jun 2026 10:47:35 +0530 Message-ID: <20260608051737.946413-5-kasturi.shekar@siemens.com> In-Reply-To: <20260608051737.946413-1-kasturi.shekar@siemens.com> References: <8b658081-ce7b-4ffc-b108-1691f5a8ceaf@ilbers.de> <20260608051737.946413-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=DoOwYAdm; spf=pass (google.com: domain of fm-1328757-2026060805194656d6e03174000207a4-h_wl_a@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-2026060805194656d6e03174000207a4-h_wl_a@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 }