From patchwork Tue Jul 2 13:38:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3652 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-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462DckVP029565 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:46 +0200 Received: by mail-wm1-f59.google.com with SMTP id 5b1f17b1804b1-4257f95fe85sf16211485e9.1 for ; Tue, 02 Jul 2024 06:38:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927516; cv=pass; d=google.com; s=arc-20160816; b=ZD2goazmnZC9Xdx+n8HmPUQU6l+kMVMBwdrlQ+/Lf16q0/gjooBr+nqSXChUVm6Q1n vfxcVC2UYGFfNZ0lwwQR8YXxhOZ6mMM/syAH4F4//+ww151S1BVF5RzKBQCPWWsDCGKp aDFpXA/LB/nKqrSaTMZSAZQyBxI7+6RLuE6djAYLJ4na+9K8kV30L6huKb0HiDVaCs1g f7vlkh+eVb3GuA1tgKZXxitLgJsXR7UqJUOwRA8RrjYiE6r8fayUPx8Us4YoXKwOD+Vx a32gMk9pF4zqNgmBqt07iWoiCR/Sbc3NK0V6G+2WtWoZs8ofI/DkAOnYEBN5Bc/PBVLO UKYg== 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=HhKFYY9c5NqqsnvhQQaX9iu2waW/85h6KeanQf3h4TY=; fh=8eALgqd9OLfv/LJStChQYyX97oNAeH8jtiYPQnyv+HQ=; b=JpDWZIkjL+ieFGEjFRXFXTpblSp2w6zsAc7KFGffmqixDGfdmDTKHKZ5oadHnK9iL4 rBvxvZeD+qHRMgoemJlc/M974ILQBFlaY7bnSyJdAVJtRGmBZAo0GMAjIGqmwFlyM41a L+hlwc15JzrkEaY06BOoBSTiWxtSTKYy88hNFdJlzWrfLBLYtMltnzBgbzL3k40LBAgl KANGe3XtvIlx1+icnhOGuEdYikp/tP12rzTzKFwhOP1kUIjNrQG3a05+u+/Iy09s3Li6 P7aIc2rGsorWJGOyZqc63pBj/29Icy5zHWS0hOa2Jf6GRQJF8MWw9pfWinE2skvziECz unIg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=u1l0ED3Y; spf=pass (google.com: domain of fm-294854-2024070213383383032a70f6d523224a-v7nvgg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-2024070213383383032a70f6d523224a-V7NVGg@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=1719927516; x=1720532316; 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=HhKFYY9c5NqqsnvhQQaX9iu2waW/85h6KeanQf3h4TY=; b=ttu/k/vkFNy0AK+byQR8vi4/i4UIn1aLiR8uWqo/rjjLhUnJ5LiLowPayeZfs4niVT 2l5QZUVWmAtmict5z6bcHdSRaB28ny3Vpu+BTjdZXCiiBBG2hFN86jxw5IJKwEa2ashO jlkC99W62equXSXV3PpIPEkK4z92Uh/0hHklMzOfA4VxmehgEt9kjZDxqI/pg8D8p+mO fjQ7vEXuyXCyWI8srAokwPSTB3OqH9I4bF332FzMdcOVTg+vTVSRo7FAuVjWlFZbav7v cDESPVk9rUt6XYsKeZJBMmkvbPsZpEgDGdEjP/vRXUNeY0qJiMr4BzatFzNUzUcNuh/x QmyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927516; x=1720532316; 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=HhKFYY9c5NqqsnvhQQaX9iu2waW/85h6KeanQf3h4TY=; b=ZmTI1rfcRYvBQNe37ueV1XepA5+tzsEBM9eyPhN/eJSlQXHM4tmhloId4Gex07EsbE ODviCbqrbY3/jlIkX/yvGoyRnb54q/S3UaHXgQXq76aRFHWlUbk9SA2CUDOrkqDHGpg3 QYO8ci9OETW2cmadKWD417RHvC6yhdGmMrv6K1gEAa81gQ8gWG1nu/KL93Z5cc4WV3er mAAFL5pyaQ26hD8rpHIMrHmT6wDx5isYDU3cN6/mpToHRaDVa0m+jIo8uCduyW8WLjab EARTpk29s5O6GmDxRHVdZ/aoUQ9PUX11V3qau6PRUFfE/ObOAh+gkYOCW9aEKe8NymZs IIyg== X-Forwarded-Encrypted: i=2; AJvYcCULyoKHZfMAdQEyTvJ+XhoQ8dHDM47g+PIo3w5lwXG5dA8lsuoeO4dC7T7vp0ioBw/fqxUFwy1KwIpHHuSNr+ZGRb2bBa4= X-Gm-Message-State: AOJu0YxYz/UyXV8Oqizw3TuK4N9X9wfN/3PD/bO4Q29kgszz3KMelEfz t5jf2iWfE3CfI+g5OAJys76gPUVLeYuVfejLgJfBm829j1jUC9IG X-Google-Smtp-Source: AGHT+IE4pIWgjTe1csXLKoxHL1EH/MLttYUGLpvJFTKU442FLfvKwbb1yXnthyFWV76cZKWUFUeweA== X-Received: by 2002:a05:600c:218a:b0:424:a58b:4078 with SMTP id 5b1f17b1804b1-4257a0642e1mr60283055e9.32.1719927515830; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4fd4:b0:421:e8fc:1263 with SMTP id 5b1f17b1804b1-4256bbe507els19002335e9.1.-pod-prod-03-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:a05:600c:4b1a:b0:425:618b:3a4a with SMTP id 5b1f17b1804b1-4257a0642d4mr58619345e9.25.1719927513762; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927513; cv=none; d=google.com; s=arc-20160816; b=UdtfTIFvA6hTioUL0ksRvHqj6VwNeOOhQfNTxHLMTfUAN+27wmCLnGGa7Q/J4YKd7H SJIJTFXVFFtxdmLmJ9mK2wcUFPeK3PW51JfW9Gy0WWlwRmzKSFkZC7ANEaaLM1Yd61yS rLdBsfSkN6LCvE3+WfyY2JbE/m30OQHQIQCsrTAhxzSvEiCP5j5BGGn7XFJCYm5dc87+ LTb9UddP4Sd+rkyjPF4gHZb8W5f9LZK+osizVgjxgBDhHtuzYYVmBpV0N3w1uYeKGgUl 0vF4mCPAAJZWCLpIhkJpKf3qjAscZfUg9sIBRpiOJQf7Kx9OMtZni1W8Fm7Ap0RxzVhI yLjg== 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=VR6hoN4udf11r0ppXkRoS4++0parX5s48edAKQ3tb+I=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=qtRBNF9/oXLWW4c9XmU+yPyaboiANxQKA+dkiJenrklr2qWwopyVRFI/ODPUAEvPUk qdnGOxlM25HyUhXa9Ol7KqiNjlV8z8FSYBwpW35MEdmsKX047SbAE2aEvLyhLfGYSYay gD0dEnj1+JgJSWSsUaM7OducqC299DFxwtjrXoEbvVw1MZUCJir36xx1yXl/YJI6h2Ax KU1VavFFy8dx6VMkio5+f/HfT1cu90BRN04gs5LuTUPGgGm/2iMwb2ri4XY2CUwVs1Ey jrLh3jJdPua/9JqYFrFBTea2u2CCeWPGmRDu0wUrzt7dCH0s0JBskpcN0bzxcrfOyDPu pO/w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=u1l0ED3Y; spf=pass (google.com: domain of fm-294854-2024070213383383032a70f6d523224a-v7nvgg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-2024070213383383032a70f6d523224a-V7NVGg@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-425788015e4si5278485e9.1.2024.07.02.06.38.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:33 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2024070213383383032a70f6d523224a-v7nvgg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024070213383383032a70f6d523224a for ; Tue, 02 Jul 2024 15:38:33 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 09/17] meta-isar: deploy-image: Allow to cancel installation Date: Tue, 2 Jul 2024 15:38:23 +0200 Message-ID: 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=u1l0ED3Y; spf=pass (google.com: domain of fm-294854-2024070213383383032a70f6d523224a-v7nvgg@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-2024070213383383032a70f6d523224a-V7NVGg@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 Terminate if the users chooses to cancel. Offer this option also on the final message box before the start. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 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 284252fb..09d6cc11 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 @@ -12,10 +12,12 @@ if [ -z "$DISK_IMAGE" ]; then shopt -s nullglob array=(*) shopt -u nullglob - DISK_IMAGE=$(dialog --no-tags \ - --menu "Select image to be installed" 10 60 3 \ - "${array[@]}" --output-fd 1) popd + if ! DISK_IMAGE=$(dialog --no-tags \ + --menu "Select image to be installed" 10 60 3 \ + "${array[@]}" --output-fd 1) + exit 0 + fi fi if [ ! -f "$installdata/$DISK_IMAGE" ]; then dialog --msgbox "Could not find an image to install. Installation aborted." 7 60 @@ -80,15 +82,19 @@ if [ "$(echo "$target_device_list" | wc -w)" -gt 1 ]; then target_size=$(lsblk --nodeps --noheadings -o SIZE /dev/"$target") array+=("/dev/$target" "/dev/$target $target_size") done - TARGET_DEVICE=$(dialog --no-tags \ - --menu "Select device to install $DISK_IMAGE" 10 60 3 \ - "${array[@]}" --output-fd 1) - + if ! TARGET_DEVICE=$(dialog --no-tags \ + --menu "Select device to install image to" 10 60 3 \ + "${array[@]}" --output-fd 1); then + exit 0 + fi else TARGET_DEVICE=/dev/$(echo "$target_device_list" | tr -d " ") fi TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$TARGET_DEVICE") -dialog --msgbox "Start installing '$DISK_IMAGE' to '$TARGET_DEVICE'(Size: '$TARGET_DEVICE_SIZE' )." 7 60 +if ! dialog --yes-label Ok --no-label Cancel \ + --yesno "Start installing '$DISK_IMAGE' to '$TARGET_DEVICE'(Size: '$TARGET_DEVICE_SIZE' )." 7 60; then + exit 0 +fi bmap_options="" if [ -z "$DISK_BMAP" ]; then