From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:6512:3da3:b0:52c:9880:3e9 with SMTP id 2adb3069b0e04-52e8272b426mr7833843e87.59.1719927515995; 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-Google-Smtp-Source: AGHT+IGbA4jAd+c1ZH8Wqs2hPonZq4jxxT7VvEvNV0gj24zyuANGUf3d2/6+pbaGeuJSS6ImZ2Cd 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 Return-Path: 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; 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 Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024070213383383032a70f6d523224a for ; Tue, 02 Jul 2024 15:38:33 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=VR6hoN4udf11r0ppXkRoS4++0parX5s48edAKQ3tb+I=; b=u1l0ED3YeNjYJEUY4YseRe8lbzEs28+0In4VQxVqefdVm7PSN4llKjUwmpvjg6UpArsror 3yk0K2HrUykma7u6Nl5xgh39PK34Dx0lKDlCvgrhhny/196dd12SK06UU6ZC0je3sE/wW+Rb Ef2OQ6rzwgC5DDMJ/0jM1VFpUEFOg=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: YgVuQ1KtcHrQ 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 -- 2.43.0