From patchwork Tue Jul 2 13:38:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3650 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Jul 2024 15:38:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f186.google.com (mail-lj1-f186.google.com [209.85.208.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462DcjP1029468 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:45 +0200 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-2ee45dea727sf43187851fa.2 for ; Tue, 02 Jul 2024 06:38:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927517; cv=pass; d=google.com; s=arc-20160816; b=WtPFK3Pes0li/R7wTU/mzDpMQFuuy9P7q/oJsLpzx6Af1fYRbrDGLaROsDrT1ljvvY k1WDYAfgamcevJOJtvI+pHm+RGiLmU7PZGcKXeb8SEfvRFlUgbTxcXBQ5k8BdAY9kujo B0WEUThhQbWkB2xrzOXGO0bf+EV4a1p6XOlALPR+iktBb+MIVlkYOPBryMRT6UqxoUq6 sppXP5Lc61V7SlMHWUofQa13FiYWp8aX/maJ2yaSJpaZxWZK8h3NTyg5S/fZGEhhfopY S0rR90tjUMY3TABUJ+CCTTrd2m8ubLJtKxKmcqUTkqRZiJFl8GosDCXrciXWZrI0EfSR ajDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=2JxF516pxC8kgNoXIs9Z1hvnMu4GgdeAUQ53/0jTjXE=; fh=gUfD5msjkDKZqsUqFlVwl8oxcUUAl+ZIGHrW3NUmfFM=; b=UBgXC7xNmRAXgQe8kKj8CLHD79aU9X3Me21F9CB8pjNHs9bhgc7tiqEE9LyKQzozgy NjSxdopED5F/H+EQBqI/vdNXX9kDC3HsRXEsOT7D+mN8r6gHHEzXvX6yq4TW4wtyqpqw 8YEcTPRyh1XPKIkHYvNrxGSsYaJm6aTyuivoZoIm39quC/thjz74lJrqMCluyl7o93Q1 1Ay4f727YK+KCBkCZqn51c5JDNIbDNgghKiWDr6xYMaFC7nBs9JomN3Gz5OklbWZAqyQ bzSfISRPNkHRMj1IQPcCvVVGgtrP9JqhczqSCxXW2AcYHRfv/U5R3ITnQ98b1MXNRBwd /o0A==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=UqYkjj7O; spf=pass (google.com: domain of fm-294854-202407021338338c589c454df3f7ee4e-irhjxx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338338c589c454df3f7ee4e-iRHjxx@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1719927517; x=1720532317; 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=2JxF516pxC8kgNoXIs9Z1hvnMu4GgdeAUQ53/0jTjXE=; b=ChqujJtWIOgp5Jkfr/NmtYzSAU5vi/nl2t/qwpxkXSAAOVx9oAY5cFxS1a76qex490 p9Ert6nQMEvoP55F1Dzxwib6GPKYPPPeaqCwWa5y7k7B4kecBrvFslQd3oK/wCPZq6nb ZpABh0DLI7hkFHkL2JAkvSmL9eGFWa8EhoAj6harNoeVanGdYJ3kBgl/WUQ5qiDwIf2K sa9aeIudKhp4UVhOLFVxb+mVqDtuGupQH1Bqja/Og2L10fH/MOxOUYFNRdSZ/jP9P94O vtiYfqXTU9j3TahEtet5Gfc9EbtUpIS02OyGDGqKGE3Juh3p6Jt1gBqFIO+SLiot88Dn Tyrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927517; x=1720532317; 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=2JxF516pxC8kgNoXIs9Z1hvnMu4GgdeAUQ53/0jTjXE=; b=VJTJKBzYhDrFdotFldqBSmGI+HgF+8gQCySuoGshB0KhRnw9JJP2RbxrJGkGXtEnmK AjRkFe3Uq+V2DLhhxSfHBuK78na+TgbBqalkIa/4OY7viaM2z8e6RZoN8SAdsU9cZOZA auCTBXNv0gwuHujhrcwMTMUpIZnxE15t4AcJ5vw78uP1SEC4q5ED5isntg9c5k//sspo WwB4muoj5VajzrLWAyOI8OAQjD5k2GJj4ZA4JRCdQ+rq7oKY0LoAKFyikV2ybKI9EnQA M++tOyq6mH4O5Dc4QA+RPpUMoAhoGLCg7Myp+PVLvvVtGUvcPNevWCkbYqJW+KDAaJUs MDYQ== X-Forwarded-Encrypted: i=2; AJvYcCX6Fohvf2vKiECwsj8rXIeXQjhIksguXxwkfzNKJPI8vkG8Uig6Kds1ORbJf+zC1VhXQqKR+fDEumLG5Uah3QC2Mjs3SPQ= X-Gm-Message-State: AOJu0YxeN09FAlbInQDF5/Ya6P66Xj59M8cZj0YkgSCC5TgVO3zBf9fV ewjnLdO+mOJPockuipWa70Dip8urECYcHfCoMrmoPGv2zd1bfOgm X-Google-Smtp-Source: AGHT+IFIBpQCTbq8Dv/Etoot/TKEanK2vXzPNlyY94wpeRzM07x2dBMFLSwSNrI8diVov/jFtSIZ8A== X-Received: by 2002:a2e:9dd4:0:b0:2ec:403e:6314 with SMTP id 38308e7fff4ca-2ee5e3809b5mr59906081fa.3.1719927516304; Tue, 02 Jul 2024 06:38:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c96:b0:425:6710:f9a3 with SMTP id 5b1f17b1804b1-4256c7b7b1dls17922765e9.2.-pod-prod-08-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:a05:600c:2299:b0:425:7c99:eb59 with SMTP id 5b1f17b1804b1-4257c99eccdmr56693425e9.33.1719927514175; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927514; cv=none; d=google.com; s=arc-20160816; b=sL6zWdH9qwth8cmCVdyqFraP9l7d40Qa2jryn8GeeIUsQ80swXTd3PgRT8mvq3J/+2 79A4vx27+LIpQqTwImsivRFd04QKkEmnfAaBZga7D/l182a4a88IZYDqSqBqTQwU+FeC sUDeE/ZsgcR/2KXMUoYYRxeLSg3OscexLceItt+L8jlPhzanX6LDLUIdXAOsbi89gGzB VgltfVF5+v/wdOBP3PwEq23Dhy8BS3eG99sK3LjT2I8b9GttZ/SA4mhe/Q1Vljoanjea 24AX3TckKejgN29SlQh0J0IRJyBdXBPr4bfcJ5fHXFCW0JtFj+CCmb3+1xOt3T86NPKS od4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=N2xjuRmRR54exWzAB3/mj+0GUcH+tsxgBQpNqwUb+eE=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=exfCOeayS3IPou3QfFum+QOyqOH+pJyIak23qJLilJYK3SQDSsg/9d7663kfq7xp+o hIt+ygkRn1Dw8z67mE7ltJynI5YbiICd5Dw5affT9mXrdtkW+rWD2vcBZGmM4zvvkiqg JpFrjTL8uafjU7jVFfb8z1vSbTI6fAoDKZQt1+t12M1aYGXXRz9vYs2Q+VGBwqHRSQUz GEGh8F7hxR6q2SS5RGE2FzFkziB5z7WRQWZEQAu+OCQCS3AfHJRNCWiv4TQYqcoaYNDH LdPO+ny5hE/8r1tgBG67g8l3Q/yIPL2zZWyg2p5gLdx6WgRGOpZIltzZBMroi7502Pn3 UQAg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=UqYkjj7O; spf=pass (google.com: domain of fm-294854-202407021338338c589c454df3f7ee4e-irhjxx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338338c589c454df3f7ee4e-iRHjxx@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 5b1f17b1804b1-4256b090706si2040335e9.1.2024.07.02.06.38.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:34 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202407021338338c589c454df3f7ee4e-irhjxx@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 202407021338338c589c454df3f7ee4e for ; Tue, 02 Jul 2024 15:38:34 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 13/17] meta-isar: deploy-image: Polish some dialogs Date: Tue, 2 Jul 2024 15:38:27 +0200 Message-ID: <861ba578d809bcd01d8dfd3b9ead57e733baafdd.1719927511.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=UqYkjj7O; spf=pass (google.com: domain of fm-294854-202407021338338c589c454df3f7ee4e-irhjxx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338338c589c454df3f7ee4e-iRHjxx@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Add linewraps at defined points to the start dialog, strip spaces from device size output, adjust formattings. Some other message boxes can be shrunk in height. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh index 673b2eb3..5ae62a55 100644 --- a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh @@ -22,7 +22,7 @@ if [ -z "$DISK_IMAGE" ] || [ ! -f "$installdata/$DISK_IMAGE" ]; then fi fi if [ ! -f "$installdata/$DISK_IMAGE" ]; then - dialog --msgbox "Could not find an image to install. Installation aborted." 7 60 + dialog --msgbox "Could not find an image to install. Installation aborted." 6 60 exit 1 fi DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") @@ -97,9 +97,9 @@ if [ "$(echo "$target_device_list" | wc -w)" -gt 1 ]; then else TARGET_DEVICE=/dev/$(echo "$target_device_list" | tr -d " ") fi -TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$TARGET_DEVICE") +TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$TARGET_DEVICE" | tr -d " ") if ! dialog --yes-label Ok --no-label Cancel \ - --yesno "Start installing '$DISK_IMAGE' to '$TARGET_DEVICE'(Size: '$TARGET_DEVICE_SIZE' )." 7 60; then + --yesno "Start installing\n'$DISK_IMAGE'\nto $TARGET_DEVICE (capacity: $TARGET_DEVICE_SIZE)" 7 60; then exit 0 fi @@ -118,5 +118,6 @@ if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "${TARGET_DEVICE}" exit 1 fi -dialog --title "Reboot" --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 7 60 +dialog --title "Reboot" \ + --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 6 60 exit 0