From patchwork Tue Jul 2 13:38:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3646 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:43 +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 462Dcgdi029434 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:43 +0200 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-2ec67e2be29sf9319521fa.1 for ; Tue, 02 Jul 2024 06:38:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=QDUz/d3B9ErDvSRkK9F/7Vlim9sgh/hfyfgaaqlMu0ow65BKRXTPPLM9o550fMaVPw yi6vjrOKq1LEA7DTyLqc/sRkPcM6f3Af8jOIf4PKre9Dhipnpvz93NABYBykNo1u//Pt 6s/QucMeZ0dlDFoRJLIluF16iMBRVYAmRFiBJvA+wUd8bPGRgTYICT96WSarwoWImpLy pqfbNLMcE7tfY30zx0cuGaAH4zZjjiL1EhumQL2f6uejWVJbVHbvMa4wCkIconiPhhzb LKmP4GzTj9+nZD3A5wRwejb5D7GgB4JaXsKLnyxBXVyyaRK7eB7OOa1EJvrBPkuFr+1i dQQg== 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=B3ziOkbpWJAEro3Ad5ApHlF6SA1hNA4jnpxjWaCDY6c=; fh=Q/aTBBotjuAm/dRm/JMO2Qr4F8SotmQdfAuUjj6ad04=; b=XOhGCxHUAmyn2aGWfNJyiIdUDOOt8NRpGQ0Hx8U1XxkGk5tZiHgTbSdkiW4z4XsR0v AM2bOkQDncY5i+eBFmMhw9MPIUNIlfU86hnfVGh2vlx+W8QV6dpUSZ1Xz9cCR1/3iCPN WAJZBGEZ0hYQnluJ5qG1Ngi3HxNn/+06Lvf/OJzowQYj5IEAxzjlmb2TLYQPq/I0LAhK 244qosY0D2Ls8HBXeferSvzyNGBG0IhhlQmBKbgJKv8kvnHZ9HwzTSobu/5kWV+0OsMZ y12j1k/TzObDRC7kOv6RcY+k8kUPnfylcJ4rPHgqMypLm/IJhgtbK+jJbxf7E6xqLrVQ VLzg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IDRmnSV1; spf=pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338326e63243ff5648cf4ba-gVOMG8@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=1719927515; x=1720532315; 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=B3ziOkbpWJAEro3Ad5ApHlF6SA1hNA4jnpxjWaCDY6c=; b=c+reiGoCbjj7jSH6jH72T64hAnG8ktekOY/3v0nNW2qugLglwuobIHX9muA7MXLAut jUJYIpRj9e6o0xqbW6L22PRsRwh/WOWITXI/PfuJ0OUZenOils4bw6MoFWv3EbxJQTro mq5WtxdEehS62VYaeIt3ZX8qQr2llzFzCufTpw6Zbb1dAXGg8tHP7d+J5pZbicjZeekd aRlnjPicwdRidebsl2Kp/VZJmdU2oRICuquNT6eihKad7ZQ9m08MKBE8diAiKmZt4zxK O0TDV4EeEDiczy/xtHYesNp9cZ0NUqo32nL3Og/jp7YcstaJ3uHAYE3Yklo8mwfFuKB2 3SAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; 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=B3ziOkbpWJAEro3Ad5ApHlF6SA1hNA4jnpxjWaCDY6c=; b=BRYT3GzU3mcKvhvw2TZWuvnM/SEkaHFcveE4WmO55yp3zRUVZ+rUXT7j4O5ULKSP1y flGb876ptOE15C6DvrQKEl6tn2mbRJvwd5b6q7Nxntm0QukYiIvJ9Mwh50xOnyGqz8vq y2yl5A4xtexQTNYPpdgLfQT/DbSNe5AGJ4SZZ274VSlMQWmbkGFltezuNowylCduKZKq IQ3F+sKqwgb0dWmok1LyE1Dzkqvkj+WJ4E6nCZDmzEbOvepsSgcUib4JecONLfe89gmZ 335/OMLZvnAYRo0cvDSDyFsFkWLAwihKe4DNR8SivRNbcNhdSysK86BGPqg8GHhuL61D qzJw== X-Forwarded-Encrypted: i=2; AJvYcCVY6CCmSdGmI/87Tq2cFZ356KaXpT//TBesN5QkbhIY3+Biv3B88SPRojsSyuYbUvgCYHqEs///gNvnAbn0DZlcu6peGxE= X-Gm-Message-State: AOJu0Yy/k1rQpy67W2td+bVgx6xeIsGo+lnV5uNi6xrep/m6wmLzQpzg iE9ofsQMZ+qNJqz1fp3ggHWLsQavbupvF/ItVl4AznbG+fEZHrGE X-Google-Smtp-Source: AGHT+IEP2u5sKD1/5JYejKygxtL4O6ngdFbQUT4lzyZmtrq+9IoCsde0wxwDEJ/M6EnaNB3m5HYKUA== X-Received: by 2002:a05:6512:3e09:b0:52c:d805:e8c9 with SMTP id 2adb3069b0e04-52e825ccc3amr5347204e87.0.1719927514948; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b22:b0:52c:e3d2:83c3 with SMTP id 2adb3069b0e04-52e7b4babecls1083241e87.0.-pod-prod-07-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:6512:3b83:b0:52c:d750:bd19 with SMTP id 2adb3069b0e04-52e82646e48mr6595512e87.8.1719927512716; Tue, 02 Jul 2024 06:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=uL2gEmy9Vs76O+tryijC+j8ckxYCcMB4WYtILFOkok3RfmSnDbMgY1kpaHe4nyTZ48 1Q5HgUDUEQPuyBrskQVFWCh5au8vND9T3iVm5xa5Tsb1P3k90NG+YYeBCoS7MIBTTDl0 ROG/emSr6lnRfyWEknuEy9KDyLGoDhnK6jBAI2vCIPZEu/pRUKfFDnkd4iP7lJGzyd1b aVRJJOVcyyQ689B+v3SyVgBwppuOiOMLfqBH0u4XClj51TuQC0A89rRqkmD6mz7fFaE7 f439GofezGlaHoZaWa3dg30JrW9dP3Ig4gy1WD/QHZYflDpJpXLSJ4NKHQeV/6zUjU0T sWrg== 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=AH531p2qPfUUUqDGsYrrSD+NiyEo6oZF1oFTnyuKy9I=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=tn/rbNffW+1DE050N0+hNjSxmbGp5YL4voV6VsGD3uh/opS+h+0nfYhBJ8IiH1gdcL jXtM6uEjxlhHt5/9DXIlTyQ/n102J6DZEephuV6fxlV2d3dFoJo1iGb6kau324v2yMRQ 7uliFdblcu/Nb9fLQC6tDrN33SxrSsq12GnA5faN9/VZSD2Cjm2WG/jjax2l2yPFfsqH jiXxpHOWLvMxKdH5fLxVhW7msolLyfWZJcttHXLtHTdtBiXSdlIrRipD4TNiqSyEbb38 pLFByDDNe0itnhZPlWPYDOaE+D5D1Ax9cg1pNekk8/E5vzMdL3kP3fRbSCgFTAQB5Es5 LrvQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IDRmnSV1; spf=pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338326e63243ff5648cf4ba-gVOMG8@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42577a0deb0si4303495e9.0.2024.07.02.06.38.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202407021338326e63243ff5648cf4ba for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 01/17] Kconfig: Rework installer image submenu Date: Tue, 2 Jul 2024 15:38:15 +0200 Message-ID: <0bfff32b3a5b866350b7283d6d7125adf51111aa.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=IDRmnSV1; spf=pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338326e63243ff5648cf4ba-gVOMG8@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 Even though kas processes it, "menuconfig" is not a valid entry for a choice. While fixing this, also make the installer payload a choice, rather than a string input, to make it easier for users. Signed-off-by: Jan Kiszka --- kas/image/Kconfig | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/kas/image/Kconfig b/kas/image/Kconfig index 45611c4e..e4f64dcc 100644 --- a/kas/image/Kconfig +++ b/kas/image/Kconfig @@ -30,24 +30,45 @@ config IMAGE_CI This image includes is for running CI. Via isar-ci-ssh-setup recipe. It creates ci user with non-interactive ssh access to the board. -menuconfig IMAGE_INSTALLER +config IMAGE_INSTALLER bool "Installer image" help This image contains a target image and scripts to install the target image on a device. -config INSTALLER_TARGET_IMAGE - string "Install Base or Debug image" - default "isar-image-base" +endchoice + +if IMAGE_INSTALLER + +choice + prompt "Image to install" + default INSTALL_IMAGE_BASE + +config INSTALL_IMAGE_BASE + bool "Base image" help - This selects the target image of the installer: - - isar-image-base - - isar-image-debug - If left empty it will generate a installer image without payload. - The user of that image needs then to copy a image to the partition - labeled INSTALLDATA. - depends on IMAGE_INSTALLER + Embed the basic Isar image into the installer image. + +config INSTALL_IMAGE_DEBUG + bool "Debug image" + help + Embed the Isar debug image into the installer image. + +config INSTALL_EMPTY + bool "No installer payload" + help + This will generate a installer image without payload. The user of + that image needs then to copy a image to the partition labeled + INSTALLDATA. + endchoice +config INSTALLER_TARGET_IMAGE + string + default "isar-image-base" if INSTALL_IMAGE_BASE + default "isar-image-base" if INSTALL_IMAGE_DEBUG + +endif + config KAS_INCLUDE_IMAGE string default "kas/image/isar-image-base.yaml" if IMAGE_BASE From patchwork Tue Jul 2 13:38:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3642 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:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462DceHH029392 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:40 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-4257f95ffc6sf16586735e9.1 for ; Tue, 02 Jul 2024 06:38:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=lOIxb5bvnlgCRO/JaUzJKpXI0ei7El+Al8T33cB7QfUP54K73YQ8Pkm5/BtlMVLlJa KNA0QAFgvZJVdpNWyJZgF0GNL9G3cf58xBKXO0BEltkZ2/X2/YDy++JVtFphBRP0eRZZ OOPecFQaqNOgiUeIsaYXC5/CrwGsVu8pBmakzwxBbAaSzOQ3P6NPCm8HC0rJcUetp660 GGRPbAZIVgFpYiJizgQ5JSRfLvndT8c4B1JY1F8yJ/wq3+c1wGV4fGMgc/1vUE389it1 6CJ4/zO4qJm/B3X/bPjFV5a/xTbYlQAm20MSRFjp/i+asw/8YsOJX6tZ74Qe6KmOaSP2 8wgw== 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=UiSDAPuXPO+ftiH/n+8QPLkZl7ZWc/KKvazdjrsN080=; fh=jEoJ9Oi22CYYMGrBIFVWzvwg1oXu6Xegn/FPYXaH3sQ=; b=MeXld/42zHG0CeuiGNEkXA62OIYW2UmgcIJvfyzLf1g4pha9PUrcMEL5IxQMsq7fZH fc57XchaAf0u7W1RGIB4mU2WtXWPxI/CaYfhghZM+ol3fgLOVmBIB7TUKVkxclrKxArj VmQdXOnYJfY1am47h8w8I+5slGXRuAQbnOvQfjMp6uWSmqkp1yrue5wIaFYcFJ5KWwFL YzYB+nI9bTdmdVAgfZiP9tJI4Rv/iW1B7yb53IUETb/rXxVWM0BDHw5b1byBjJpTAUgW 5ScARTwFHeUuydvd5OwMl0o+VifH/gA3frI01waSKji49IT60EgTgGPzJdQMngVaH8+a 6JMA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=iWSDxCze; spf=pass (google.com: domain of fm-294854-20240702133832e668a510e0ac89b285-z4npvt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832e668a510e0ac89b285-z4npVT@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=1719927515; x=1720532315; 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=UiSDAPuXPO+ftiH/n+8QPLkZl7ZWc/KKvazdjrsN080=; b=mGGarOfEKcFw2YepHhtkhBhnyhEY0yS0WiuVfU+JpjEaevK4rgQshYBpmunKYUx+JF 2zxtXN471w8VEQkODONQRoETnQ00SlBwtMu0/ggzm8j0cHj/fgiGIK1fhDe8DSsD+AZa +YJCD3myKbBPOVIMO1/eVujlF5r/pyFAhNqDoSqrRBhHWZqP2gap1yZ4bQfH3UbAis9D 4XdrIq2oCIGVX8hwNOk28Av8D6HyxoBV1xiHHKbF5MH2/OC3Qf37L/HPQHV/FBNOk859 WRrQ12ddbl0jORzZf3+wUoJK2VQ5G5Dsh3N7tZfg3m5nA68+U1lDwiniUm/0JDis+w8Q E0vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; 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=UiSDAPuXPO+ftiH/n+8QPLkZl7ZWc/KKvazdjrsN080=; b=NEYXt9MZP9ibWNn3+1B352XYdrjgbtaAGKUOcuWFmZPPJWeCTqWih9AljbKC6N7PVU HQ+cICmT/Q8AwiRDSFBZ+GC+elm2AJTWfNQi8rkdsifPepUS9lYm0XtdkYOLS5TNLnX0 JIAh5/fTgYW5nJovp3b0q1BvqtEfS67YKeAjSUvYoH55ZxXPWZvsV8FKpIp3bW0/KfF+ VnA8BpSB1lfUfbjn998jXAzaHAW4PorQ3/R2OXZCO/xolXalm1WA3TxJw1eRJT50joxO gBIgvYVvwRjHrm7fXrMf2pjiM5SJNWbHd0YGEidaHkAGn5g8bXV+rjnru6/a9bnmtlGv LhiA== X-Forwarded-Encrypted: i=2; AJvYcCUkcqpmmdXIkWrKpBfmx/uFznNV82wz0CnH9PXrJGdmkvG/s1oUrdTsMAHGZlaFFOCAbEjBch96NT+VtrxtydSGv2+8Wkc= X-Gm-Message-State: AOJu0YxBKIq81nLThiUrCrDPGBkzUVVToNcbX0vtvzUEbxhh1SkZhnzQ y9m+yA80UiP5IYkXUwlbdebvsDc6l6IGzjpNq9Jdis1t563wMFxk X-Google-Smtp-Source: AGHT+IFhnxw9Emj/z/ubR6Hc92BkXE0qOjbmnshgYOrRu21dr55CxvWmY5YID5EmD/IrSfRQFlS7eA== X-Received: by 2002:a05:600c:16d3:b0:424:ad6d:c2ea with SMTP id 5b1f17b1804b1-4257a02e84emr47767775e9.41.1719927514836; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5586:b0:425:7633:847f with SMTP id 5b1f17b1804b1-425763385f3ls16389625e9.0.-pod-prod-02-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:22cb:b0:424:a48f:4fe0 with SMTP id 5b1f17b1804b1-4257a02122amr66128365e9.26.1719927512800; Tue, 02 Jul 2024 06:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=rKAO1WFDAJ9Blfa9x0Um+tGnrslIrJWGS175cGcgK7qa+NUuEMCG07s8jrQpX7Jilo gygp7HK8vGBPiDIafHyK4JROoOp4/nNIQK+HdqG4elEnTC7L21apts79c/G9LAPrSM4o ZQSXMkblSDpim0Vn14rN7/MY+sTnoncH7njnwQV3IDCqAMc4HZoDQiU0CZWy3hTjZSgk ddTKsQMHYaLEANJlwQImrCXh53zMf+7DUYOMcFFA/HG+fuGH5l55oF2Q8uHEtz8PnFC7 nrezODdgCSJZgT1nR0chdOWWFdq0qFybRAWhuEAqwjyAn1v5m6fPfA9b+7ILvCAfS1Ha /1ZQ== 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=YjcZCAnnb8bgRl2nKL0vZIJn18FH95Hws9fmfHxNBgU=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=hXp33SsP8PxnadkX4E9Q3mX0R/Vz/8KBg9EGkkbKlT7Zm7WpbeiG3LKMWv+JKh69FN NCofaMr+p4FZQQVDeRTQiUAk8V11ReuTqhEraAsZL6vac6I9Cv4CncExI+gcV5YTxLGN aqHSaUHepmDoQXhinG1BBdsm0XHheTmZmjRPn3ReTo5hr/No7qTgpa/YtmreIGThlxNv +EbtJPBeovqqP1gmK8x2y6EOli6o/zz3nVvPBY/C/VzITmvnLE9ANB3qGpkCnEJWDQ+1 3m6zbr0nwPxauhX0uHOhPoakVUVXDUAt9vR5gOMu5enASWSoqiA1O0E273LfavzBtA6d RXbw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=iWSDxCze; spf=pass (google.com: domain of fm-294854-20240702133832e668a510e0ac89b285-z4npvt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832e668a510e0ac89b285-z4npVT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-425788015e4si5278465e9.1.2024.07.02.06.38.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832e668a510e0ac89b285-z4npvt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240702133832e668a510e0ac89b285 for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 02/17] installer: Do not show systemd boot menu Date: Tue, 2 Jul 2024 15:38:16 +0200 Message-ID: <1b5440db058a1d626fb5cfd320a0f7110b3e0266.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=iWSDxCze; spf=pass (google.com: domain of fm-294854-20240702133832e668a510e0ac89b285-z4npvt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832e668a510e0ac89b285-z4npVT@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 We only have a single target to boot. Signed-off-by: Jan Kiszka --- meta-isar/scripts/lib/wic/canned-wks/installer-efi.wks.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-isar/scripts/lib/wic/canned-wks/installer-efi.wks.in b/meta-isar/scripts/lib/wic/canned-wks/installer-efi.wks.in index 62c045b6..be8127cb 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/installer-efi.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/installer-efi.wks.in @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: MIT -bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0 earlyprintk" +bootloader --ptable gpt --timeout 0 --append "rootwait console=ttyS0,115200 console=tty0 earlyprintk" part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --label efi --part-type EF00 --align 1024 --use-uuid part / --source rootfs --fstype ext4 --exclude-path=install --label installroot --align 1024 --use-uuid part /install --source rootfs --change-directory=install --label INSTALLDATA --size 4G --fstype=vfat --use-uuid --align 1024 From patchwork Tue Jul 2 13:38:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3644 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:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcedi029400 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:40 +0200 Received: by mail-wm1-f60.google.com with SMTP id 5b1f17b1804b1-42566e8a995sf31409575e9.0 for ; Tue, 02 Jul 2024 06:38:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=y/19yRH5CwFGniImPnyNgFWKuMud6ONAZ+YICqsBu0bHHlPTKpT39OyB/p4OnHVEnM VRhSAaU3bI9WS9mUqf4EoOZTEBLhA2N1R02qOdw9KfN3HG+bAk3RVhcV6/pIKj+dEg2p edd10T5bRLNAklyV2/7Vvdqx8Kms1yWRPpW3lvsxoBSEtIXA08FJBzFTwh1OSHgcqJIG UiFXtSHaK80Y/6fEiWgv7K4vCYxCLt0p0DpA1qzuqeZava3THYpnNnFcQ4p1KxhQjq5G Tw6HvaPm4hsqg7oV+T+HarJ6JHBn9XxccH6C8av9r9tKT3UQPRTMNeb3/4Ex/IT2FDjQ NayQ== 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=DNvS+KCItbbFX9+N/cNgVn9s7PKfmBZ9Q3s+W1SCNtg=; fh=UuJ+8n7ToZoaDEjZrlO84n5nnD0yRxpPgo3thfeVy7g=; b=zIwjakf2+5GWiiONbkF1fbcCkpNgpgnApukKMlj8Rip814Tydjvro0WSIz3qp7NnXk KCPbTQuzJj/V5/9RIzRNmiLzl7uQ7Ny5IT/lTVZ3Wqc/NE0WXuhBa/TIRWQBNmTgIsWn uvZ64AVP1AbHePsSCyNh5xGZ2W4gLF1eJjaamoooUr756VM1AKx/yhl2yuArN3T/Yh/H v5a7zWYOq+PyQgUhREb1FdYm8Jr5BxE+LEuATHI2DFU30qd92kwB8EmIvcVGAN5voyg9 9DHzn+BwUcz8PIzzGLggh32nYyj7utfFHRMh2lXmbEf99oJtQM8UHwLxrZS2Uqa82/5r n+fw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=nWnQUL9G; spf=pass (google.com: domain of fm-294854-20240702133832b526d4488568fbe3a3-arcwrr@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240702133832b526d4488568fbe3a3-ARCWrr@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=1719927515; x=1720532315; 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=DNvS+KCItbbFX9+N/cNgVn9s7PKfmBZ9Q3s+W1SCNtg=; b=urqbTXvCvO86zzb4PhooMJSahDVs5sZ79LH/1siFPqb5veTbYUPQUqzKzhEZXMbKvR SLlhybWP8PXFaVStoEbawzF8t7WGu0rn9IU+sRXqLTLIenVsY6qnz0Xsu2pb8HfI8P2C iUiKQlEbz4wIo4FNC2irEKuKqULpyFc+RRhyR7Q5O2hpJCCBak3yw2hBrwS/OwlnuXS+ mNyCrxY06AtXGg/AfWFgBTncnsEEzf/cxDfXzPkp2mRyIs5ppjDwGz6nZBlWW/GiUSMh OhquRh6Le+vXIis4c00tmOj0E1cff+u91u75Ow8hlQVvp5Kj2cGMt9ByGtsU6ST5ofq3 zoJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; 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=DNvS+KCItbbFX9+N/cNgVn9s7PKfmBZ9Q3s+W1SCNtg=; b=m2r+pv6HjpY3k0nVkhfnveSNtDhufC5STBDehkZZpHGEoAkKIYDCMfrfZmck688uxl PpR1jNafYGPUtLP6ytjYK4SMhhROYgh0gYaFh51XY3e7gzT4mkue9D4wlwY2nvYx5d9N uoJS1Bve7M1Yhgcf2vkV64SSBjf4kcEsVdk4lMh8wVMMLFIJKdTfy6vGzh+FV0lkv1+g xMB2cbiDE37LaWsO+B14YjmtqTSH1xktiE7BTLPGyVm+i74n7uKvfMhDOI3xR8hB243X jskdovDFabFA6nDl660VzwxDy0tUdqY0M4PfZHnd4A/g+8jK+8Hv6C8FjBZDm7zdwKm6 IbOg== X-Forwarded-Encrypted: i=2; AJvYcCWKV0x3ZAifVOIn4ia1SYjnc2pS3hI3G8EPLs8rD0dcibpfkfX18rUMfC/EfXfNBIIhsRhK8fwuLpWJE+EnqhF2aROESVQ= X-Gm-Message-State: AOJu0Ywsq3pm6vAY5YrGWFedUM8m5IESLkxefJf/Co3glw4kTsj2NJqU 2MVqNROWDFpyK44epwP5IoZsb8XifEAuot9TfHeMDgTnh91pgk37 X-Google-Smtp-Source: AGHT+IGMJN4chXLHRW3eYv4oZJTHa6EBYy4vQVuRICYLic7xqLXpk67gRisVEHtMypIOOikBAKlvIg== X-Received: by 2002:a05:600c:4b1a:b0:425:618b:3a4a with SMTP id 5b1f17b1804b1-4257a0642d4mr58619785e9.25.1719927515116; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b9b:b0:424:ade3:c6c7 with SMTP id 5b1f17b1804b1-4256baf882als19138015e9.0.-pod-prod-03-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:5486:b0:424:a779:b5bf with SMTP id 5b1f17b1804b1-4257a03a561mr63106675e9.20.1719927513034; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=Ls9Wr8CsZNdUz7jSDgQZhHBBUeuc8Yt9lJXrwttGONBTB9F39+1wsqYf/FYX6TepWH SRZQ+7NALpP6lfZBWCI1WuBmY/yy2oQuJrBhDPazzuWHOsJhV4KaN2opL45KnnTa3JNH J6gpRzVhUWw8BGjiKt7yDhVuC1mUuxNZYbPj82tBcPalCYkGRZTyZyJJXO+1tiISErj7 4B/jp+Sk8gYLNG/hhJ8LD0NvKIbpfCKC/7DbdJYs0hFj0Ghh9sZiESXchmCPsVtUaoQp K7MAhzbc3/ckQPf/SDOfG48cN33Hf7A79fMhZa8TMBvh4BhQ9j6t0tOShDIGnYS8jxtd 8zOg== 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=3gC5aFHUmtelwEfs9ALjODKNg/upm2KsGay7mgbuZVc=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=v2M87i1AejXkvfwailxGM00cmXHxHwe5ErtF78d+7z8gDpvolJebDahTBqvgmwYQER DgkYDtiXjYucqxtlfRN4fcH2YUvkZR9bjN82jew08mG1H9OIYjcbQcZ3FdP20Me9P8y+ JjjKtrFNdPsjwDLNoaXMoEpDTbxO5Tg53OCL2oQXv4uIrNwqQxDwiyUe9/vXeOXFLKal ieU/9Evsd5GzDTL3pFWctycCcipOeitl1GfhpOMiOJdiODduIm63lZqc3BR8dkpbepeh obWRV4EXwQeeL4AVorEVWmAP4XCRk9Y7A5FWtU1D4emkAWs87C2zVf/NN1Dz45uwc1Dv fqoA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=nWnQUL9G; spf=pass (google.com: domain of fm-294854-20240702133832b526d4488568fbe3a3-arcwrr@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240702133832b526d4488568fbe3a3-ARCWrr@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.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832b526d4488568fbe3a3-arcwrr@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 20240702133832b526d4488568fbe3a3 for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 03/17] meta-isar: deploy-image: Change reboot logic Date: Tue, 2 Jul 2024 15:38:17 +0200 Message-ID: <6e97e882f080e09a9f7d777cc84e9cd089d92d11.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=nWnQUL9G; spf=pass (google.com: domain of fm-294854-20240702133832b526d4488568fbe3a3-arcwrr@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240702133832b526d4488568fbe3a3-ARCWrr@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 Pull the reboot out of the script. This allows for cleaner integration with different calling environment, may they be a systemd unit, an initramfs script or simply a shell for testing purposes. And if the script exits with an error, wait a minute before rebooting the system, rather than just trying to re-execute it. This permits to inspect potential error as well. Signed-off-by: Jan Kiszka --- .../recipes-installer/deploy-image/files/deploy-image-wic.sh | 2 +- .../recipes-installer/deploy-image/files/install.override.conf | 2 +- 2 files changed, 2 insertions(+), 2 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 8043aff1..12c1eea2 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 @@ -105,4 +105,4 @@ fi umount "$installdata" sync dialog --title "Reboot" --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 7 60 -reboot +exit 0 diff --git a/meta-isar/recipes-installer/deploy-image/files/install.override.conf b/meta-isar/recipes-installer/deploy-image/files/install.override.conf index 73874caa..357d8662 100644 --- a/meta-isar/recipes-installer/deploy-image/files/install.override.conf +++ b/meta-isar/recipes-installer/deploy-image/files/install.override.conf @@ -1,5 +1,5 @@ [Service] ExecStart= -ExecStart=/usr/bin/deploy-image-wic.sh +ExecStart=/bin/sh -c "deploy-image-wic.sh || (echo 'Rebooting in 60 s'; sleep 60); reboot" StandardInput=tty StandardOutput=tty From patchwork Tue Jul 2 13:38:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3659 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:51:53 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f59.google.com (mail-wr1-f59.google.com [209.85.221.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dprqw030566 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:51:53 +0200 Received: by mail-wr1-f59.google.com with SMTP id ffacd0b85a97d-3678e523e32sf254352f8f.1 for ; Tue, 02 Jul 2024 06:51:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719928308; cv=pass; d=google.com; s=arc-20160816; b=i6HDlwSgvmXpaoLY3aDFIR89xFdNOPYfK9JBeed9Q4+W7v/3i2WAetdI09GREzB1rL FNx/0/XDYPAuvVLZSYBE6sQAiyrzleyfEJ1myiC0eGS4/Fbu32f/d6Oyh9aSUidz6C2j 7VicKAFU8qWQ8r77kSBxNVViGfhT/UlKO3b2Qj8/s8vpW8pBfO2WsSl5Ch23DX5olGzl fy1y64mjEYFv9nYAhLtBGsYw1SHzucd156IAA9kgUxQZfKx+3ctH8+tseoqQ76IPHIho MARvU/MpG4h+b5PvR3nH64LxQ7M5Qdz4/quAi8jcrcvqGps3/gxAh8Pt3P4T0FeYn3ZC wXtg== 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=tN0RNLCv2ltmXOZ2GCQ9lS9z9HiElzGaz5c176M/xdA=; fh=k4DpMODiYAXSKB6zxaaTkU/PNgZXdnJl8XbQpuTHEO4=; b=i0Kf1mIp8EyUaEpbWPYhUGujV9ODAnJtrO+BWtRnjaokkSlGqGnW47zIshYJ/UAJXD WH2J+3CkbsojS6QRo1QF4v2hzxA5nmUW5xnMYipSnKstyvpqp3/pZjtTJtoAbvGY3HPm d3xogbkn0f9BCrEPLk5t6Wz7L6FwwHEaOYwRWvo5ILuJW85Xh0cCoDhRaNNoplf15DN9 czWDBvU32iVoeC2F+xWY9fVmMQYPMRO6cPwnhHexqW81frf51mRvgCTw04R+09c0IqAC /B5ood+W81kqGLtop3ckDMWRrgmkw/cbDGOzb/pUXpxanyFOtRa6ZcbB6IbF0iUjWOpN SUnA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=aAzhcFrw; spf=pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832bc19c5c422e84213ba-81kgXr@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=1719928308; x=1720533108; 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=tN0RNLCv2ltmXOZ2GCQ9lS9z9HiElzGaz5c176M/xdA=; b=NQYwtbhN7NsoR0f7KgF0ZN3RBaeYtuPHysmfDBPEwkOhfws21uFKUfH00iUB1Z7prr C2fycJ7PfZXmNMGL2nHjgck88A8QlO8vtWVYSNHWoV47orn4KHXnPEBKlqZkH8kVCB6W 2cVbmFxJIu15G9wGc1B5yPV4k9g94yAtbTP4HJ5bDO8UfXdyoKoyL24uH93F+kQcSJiO UAdE042XmDSxcTEpQwDPCPNHwgflm7HtJeRbyTPkqdZ6W4kfAfRyquLY29ZjYfyDGMDZ DtvkUpy5OOhNmZSGnQRBGemnHZd1YIgSa+ESjGH6UM4ILCwTUSBrPPJnFJgOdZ2bpNNR tfCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719928308; x=1720533108; 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=tN0RNLCv2ltmXOZ2GCQ9lS9z9HiElzGaz5c176M/xdA=; b=rUsm8LBuw2QLUDiqSSs5mZyDU5NJJ1/uUCHW89ORs/S9O84QNLm1GAVetD0rlKDTRB ZpS8VhNRbj12kPVIJA1CccsV77TiGTVszW0TirW6WHLhOfTZFYBnDAs8+Dy9ToLbXJo8 RS65A/n6qBsc/GELhkbFaYJtlZBy3DZ9f0tyeirwc1XzE6+ccEsLjvGTpt9+gGrIQkzq lGAteTsWPuGLzZ2gdnPhalOXUZPrwpEizpd/m5ukc1aOprABMAZKLA6BlB3OEQfHQGUm GMkOx3I+/8szhm0jn8zWSU+qL0IF8+RhbUoVjM0XHpUgH82tvDdTFN5Bd7z6QDuQG/DH xshw== X-Forwarded-Encrypted: i=2; AJvYcCXVvDDQlXHS4vso9J4d/FLeUTweS6h5PzsePzlCGT5Er4GvCjlj23RBsEc9SP2B6ct67RTW/jIV1tfuXtxcoryFc77Thf8= X-Gm-Message-State: AOJu0YzPhXs5LdYOzSEKy3kJFhojaUIT8Tjssw/c2ul/ge1Bu+vMFKvr kcLP86zlwI/LdZTNCzgbbzYFcBzQBoH64+VDUNPyBvVOqJa7L8o4 X-Google-Smtp-Source: AGHT+IE1Vm6KM96LfPbYsJ69sLxngk5jVE/cTf6ss39o4Z7gDZBqJGmb4yFmAnczyPX3yxmb053qLA== X-Received: by 2002:a05:651c:549:b0:2ec:1e6e:13f9 with SMTP id 38308e7fff4ca-2ee5e707c78mr70803301fa.52.1719927515228; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d05:b0:423:7d5:b519 with SMTP id 5b1f17b1804b1-4256bafed87ls24337085e9.0.-pod-prod-05-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:47c7:b0:425:5f73:e2e1 with SMTP id 5b1f17b1804b1-4257a00c088mr75237905e9.22.1719927512947; Tue, 02 Jul 2024 06:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=aMmOaGp7sw3cTN0Lik01I02haxUeU2jqrhJimTOLY0EkhUxRKiJ9vbzlXvTtjw3SWN kXLhdXt7vIiChOirEl/JHC+CstGtWXI6Oz7qmKpczu5y3pvMdQtoBLq7m86xHxsTtn5a QUUqxWcuEYIY0BNQQSzsjOHwiJYiNpcR+pAZJyFcpq96YZgWFGABoCXIcjGbMFD7/v4l mBNzQB/8F1BYUvCkVeiUhUzyrk/HAseSz+BREz5+q3ZqgDum14DIsszhBTU59AKQMMa7 Y447ThYQGB8b0OZ9KQWuMYfSR+d1L2Y0Y78XqH7npU2zQSUuFZhyjT6+ehBRq106ErLL vGPw== 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=VFjNekDTmLYK4Zex6YatbGGInn7rDQtaV/vU4Tb+JcA=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=zuKS0r/oBANab3dDGGt6RR4/gi1Zo4iKn7oKfKqDbpV+QXm6404TjDatG9maPwobDV r4kRkUfce90/ypNrJV7fJWX7iDJEPz6V7xcM/NrRVfx2dOKu4WCf6p9ljbOYIKIFkbTU AIQHKtRTviAAatJqGj/QR5YRxMxKpkAl5QMRMkMYT9lOeuH7N9aUUzZOEg7uCzQ/vqhK O+9F6USpnDX1lLpx0/YRpy9iZ3w1WE4jSEV4XU8uTES9Rt0ZQ4+sPGRqkn6yTbs20B7f zw4NWlnPW6SPc8s8uHju11vthIRYRhQ0VHI6VCu86SRnBMqa+lBZkjuoA+h4q+5Ada3j zIPQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=aAzhcFrw; spf=pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832bc19c5c422e84213ba-81kgXr@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.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@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 20240702133832bc19c5c422e84213ba for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 04/17] meta-isar: deploy-image: Drop umount attempt after installation Date: Tue, 2 Jul 2024 15:38:18 +0200 Message-ID: <62731074b0405eb110b1c2bdc1543d2769ccdac7.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=aAzhcFrw; spf=pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832bc19c5c422e84213ba-81kgXr@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 Under systemd, this fails because /install is still busy. In that setup, systemd will take care of properly unmounting this partition anyway on reboot. In other setups, the caller should take care. This also obsoletes the "set -e" because no commands are left that can produce errors and are not checked explicitly. Signed-off-by: Jan Kiszka --- .../recipes-installer/deploy-image/files/deploy-image-wic.sh | 5 ----- 1 file changed, 5 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 12c1eea2..9a1fa651 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 @@ -90,7 +90,6 @@ fi TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE /dev/"$TARGET_DEVICE") dialog --msgbox "Start installing '$DISK_IMAGE' to '$TARGET_DEVICE'(Size: '$TARGET_DEVICE_SIZE' )." 7 60 -set -e bmap_options="" if [ -z "$DISK_BMAP" ]; then bmap_options="--nobmap" @@ -100,9 +99,5 @@ if ! bmaptool copy "${bmap_options}" "$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then exit 1 fi -# we need to umount before reboot to avoid -# data corruption due to the use of vfat. -umount "$installdata" -sync dialog --title "Reboot" --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 7 60 exit 0 From patchwork Tue Jul 2 13:38:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3658 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:51:40 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dpds0030556 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:51:40 +0200 Received: by mail-lf1-f57.google.com with SMTP id 2adb3069b0e04-52e71284e6bsf4682057e87.3 for ; Tue, 02 Jul 2024 06:51:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719928294; cv=pass; d=google.com; s=arc-20160816; b=NehlnVy3bTXRg2lfsjlEuLXWnJ99T779W3kBPwDMDdk5QykwPGFTycfM6M757MoRTf OxADL2af50Z1HAFkRFwK20Yv5NLOEPGtkaWNV88gSxHW3nK+rfEBlCU9ysSkn81X1aGc y14a9mR6yRjWk4dLX1erR2wqvqaKSPOHZVjfLgHtkQ34PTv/IC4b3+YWmBxSbzhWpJ/r ZRUkqYB1ltr4fCNeJT0+zz/srB3ruvONudfvBDeGmlA1H5OK+xCfSu5v7mHYYkr0PqRv GjPTmcujYxwWRPQI7B2OpPQo7hx71927wuXCUOAst1GWKvEFCdUmZxl3Df23I/CXGZs7 8OsA== 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=vcp3MKVPinm+0nf0nqvbRMguU0jlAlvKfQ+Kl1ic84c=; fh=dC0qpp0m/MKbgN/PqoVGKtZXZ1ayAfrm0UilP9LpX3k=; b=TEhAdNMhb5dh7vsFtEVjIup8t0nL4MftmDQAw+1dtYnee2wLhoEFbJC73xezH4aX2t x5ne1X4hXKOMw4CPp7Y3aj152fi4BAzWmbhMt4R1sg9SVsVBDMkU0tascAyPnA/0jPme hiQdsD1QheFIm1KFIuIexIlCS7z9DGt15MU9mIaOCuQ1Eaf+wE/jwLkUICoCHAkk6BiL 5JHheBwWs16wSHcr2KBh2cW3u/+nKGfExu5k2T7XUf02phzgOEBx6WbMmfZVYl3kqSWd /cXGfHjffdaeXoJtQdTFc8UlXAtgEIV1UN2NamBo+nI0QwqdgQck+4Xo0jRUbOmF4it0 iNtw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Q6+uYZgo; spf=pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832006860980d3dfaac72-deZnxk@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=1719928294; x=1720533094; 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=vcp3MKVPinm+0nf0nqvbRMguU0jlAlvKfQ+Kl1ic84c=; b=RkHqhCQRV8P23buOw2JqCjkASOh7IZ1wVUxtQrHbwqbZVZjUEvPTThpLW1oG7pVOsq gVlY7ghBBk5X6LxNISSyY6tl0ur0hYdff2L/+e36kDYy7gqCMHpY1D+dlqE8AHWDSH00 mQBeWQ3BZXGsLpI74eUoCHZfZcQu7oggPUTnxzFHKfb50RU8JFpOpUhSoq0uc9Iwv5Fj kG2eb/D5UFzSjfrHiLSQyu4qbt94cEnfFghLXDaHtNm84Eo4k0ArefoNKPcyonMlcqDZ gc2/AxO5SASZP9AZETuT8L7VUllu9MHYYiP8vsfQ4P4QtVCmdwXztDHVYQRDwfdA5tED G/Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719928294; x=1720533094; 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=vcp3MKVPinm+0nf0nqvbRMguU0jlAlvKfQ+Kl1ic84c=; b=MiWb18vQXVPrAV25HZycAQxWmJAu46BI4bfsfbyl3DN9vvrIDIn0MQDLAFZqmtIfjw Tm7xS5ySObK3Kgi9r6Jg3IU/YIrXjwpJu9z06lEUvRw4h+jWupXxK1U3ZVOTz7MpdzT7 JtMAK2zsCnjElkvsNVARlqoyVOeAO09RmqU6pWXu33gYiJUh1DEHK4fpEH8Xc+kGypRH hZVqCXk/ZVP+WgKBMNDoPdcOCp9ArVreXm8KQomIFiGRJ1AVo4QIR5FIqPi4GAyRREdE oadwWgNE6xy+lc9gLRYMzlDGiBBK/fRsN8uEf1cNK2W1AlFLqjpEZs+5LvO6l5QlcJE0 /bGA== X-Forwarded-Encrypted: i=2; AJvYcCWGcHoo4gTFrzjV62fdvJ9kfqTxeVKyEuTTpnATXuOmMA8QrYBJK6iN1pcqekMOhYJGpR4anhDu/TUS2tQAQxjeBoRVp9Y= X-Gm-Message-State: AOJu0YwwSC0eQ8XhwCxz+6sokJ7NUMB37vJtX8v8S0h7zsgTWc9WiHGT C2y62lGySkmUKb1RW5ySWwsTWpc20p8XvBO1ETGs/AWZcWh/qrr5 X-Google-Smtp-Source: AGHT+IHRPKvvwNCJ+mvhrWXgdxBQwaxFnm2MzBClgObwOECQqwtJl3m7JFvKGsxZICQQtbWWpdawpg== X-Received: by 2002:a05:600c:2150:b0:424:a4ab:444f with SMTP id 5b1f17b1804b1-4257a02f1bdmr55059835e9.33.1719927515222; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d16:b0:421:ad3c:1cd1 with SMTP id 5b1f17b1804b1-4256bbf8cd5ls18715805e9.1.-pod-prod-06-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:4f52:b0:424:aa64:e9b3 with SMTP id 5b1f17b1804b1-4257a02b701mr55711295e9.29.1719927513007; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=yYj3YbtmrzETWEFWnGTkOlibjo8M2nW5Dlap9w3+t4Tf/HDLoszYXQ/Edrh+UxMlQ8 63VkILniRU4UyzFqAYjsWA4jiyl+Eo0DB7m+TqogBw42I7r3mohiWj7lydt7HhGD9otH y3L6jjZOIHIqWgkpjY3A8gKICoiJmD5smTAqOT0R2rQYdtvOQMNd1OOcNts+yBBuFrtU qokdSF1DxNVREv4WKVF396o4KKBib3W1oAGHGhcLvmItLnLoaQNdR3g4FpwNbkLBtXWW x7Qa+CVja5lrto+9nZ8g+5xDZXHGkcdL+MTxztMVoOGhLG1NRV8fxufn58EUe2r6Hzzk 2/+w== 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=AzbDf9OME3ALzAePu9V93MBDRj69k+TftArM78xHzqE=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=eQ+kRtlI9SSOjIFOjEux4KZZt1GexVzKLrbeij0CMXl8eFE9vbehpzZJS4ts96Te1h SPkLj8GX1+0Mh156Cxt1T24szC3u+pSUb0qLgi82FByHZyhO8yeViVgC+iS8djsIOHhr C9fcXGxWOiwLk3ZI6BYmPWZ040OtXxVjzC6mzj3Giyr+9QZS50Ogius56Og1SpLjTSI2 srF9Go1G9OI2j+gmGg5AYt0wwjCkvfZt7aSMrLoXdAiSTd8DgOXQqv3eWtd04e8Dj+6y NBmGRHMuA+43uUCRF9oW6zsmW9RSqvM7VzG06yY7+aheGyw8RQ6sU56SZQZNLuz0DZT/ Y03g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Q6+uYZgo; spf=pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832006860980d3dfaac72-deZnxk@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-425788015e4si5278465e9.1.2024.07.02.06.38.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240702133832006860980d3dfaac72 for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 05/17] meta-isar: deploy-image: Fix bmap support Date: Tue, 2 Jul 2024 15:38:19 +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=Q6+uYZgo; spf=pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832006860980d3dfaac72-deZnxk@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 If the to-be-installed image was compressed, its corresponding .bmap file was not found. Fix that and also ensure that bmaptool is correctly invoked if --nobmap does not have to be inserted. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 8 ++++---- 1 file changed, 4 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 9a1fa651..d27a0189 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 @@ -6,7 +6,7 @@ installdata=${INSTALL_DATA:-/install} -DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap") +DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) if [ -z "$DISK_IMAGE" ]; then pushd "$installdata" shopt -s nullglob @@ -17,11 +17,11 @@ if [ -z "$DISK_IMAGE" ]; then "${array[@]}" --output-fd 1) popd fi -if [ ! -f "$DISK_IMAGE" ]; then +if [ ! -f "$installdata/$DISK_IMAGE" ]; then dialog --msgbox "Could not find an image to install. Installation aborted." 7 60 exit 1 fi -DISK_BMAP=$(find "$installdata" -type f -iname "$DISK_IMAGE.bmap") +DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") # inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh target_device_list="" @@ -95,7 +95,7 @@ if [ -z "$DISK_BMAP" ]; then bmap_options="--nobmap" fi clear -if ! bmaptool copy "${bmap_options}" "$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then +if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then exit 1 fi From patchwork Tue Jul 2 13:38:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3645 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:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcfks029418 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:42 +0200 Received: by mail-wm1-f57.google.com with SMTP id 5b1f17b1804b1-42566fb83c5sf7140905e9.2 for ; Tue, 02 Jul 2024 06:38:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=Ybe5GYsRhEh4kGvE0NHC0/5+cZiq1aLqS42mootGvV52Th3gdd4sMTA0gD3+I5lWXe EOo9MUIck6JlvMBUqRTdL0JK27lX8tkTLJ87T6a++tJlT8TG/ydCGmXdU7hGyvCRXnT8 ZJnIjFouuGy6rmiK0Ko45wl6hpi7VAOBjySTq0HeOTV8LjEO3BWdqWL+YDUjo1VmtZWY /ent1xISEwVBuQBpmVBVqnBknmh/c5JLjk9/rNigMxtwl/LOQm8WA914CmTHCNFntyXs gQeioRRNP5uvx20FJBGDD9yuzuikmJiMt22B+5tcYExcjX0pEU+yoWKVGJwjyDGzHjqi +tUQ== 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=XfnKmDuPpCim1Hc+Fq5FVD0B/pdiBieMKocyS6xE9n8=; fh=kztVJEL6Po79OXyW5xoDUjIKRNcLFgaOO7Vc1Wpc5yU=; b=xY9fWPGiw1EwLvsBTEqsC5sdX1S6PGomDX+fVzJfPygqm5VrCuSLURSecajzedypHb /F7Is++9W5zSzr+okb4esH3jZ9Z/1M3YlmEYYIUC0N164lfWy8kOcJNWQuYw0jKIHc8+ rseFbdPi2ijpH2k91vKzugs+0KPCHzb6Y07DTntTKzjnfYI4nFH99IvIBYTllmnnB6nt DDxwTD3Fu7ejiGpA2ol3k6FFCodafsiKRdL9JlBwzJP39ZPz1HUimdgC5p/tRulRi72S 4fYOUf8sJ6RdXKqoBEaMi+g/SFZ6n9WASFp+ofFomqDSQ8ea+hDpJdfbA2Gnq7UVYxgb gZTw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=NEat2Ckt; spf=pass (google.com: domain of fm-294854-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832c8b1c19ac4189077d8-EHcdzl@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=1719927515; x=1720532315; 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=XfnKmDuPpCim1Hc+Fq5FVD0B/pdiBieMKocyS6xE9n8=; b=MSFHPSw4K7H/1EcqgKcwF6PtnZXvLiFPI7Naah/MQBaIg1/QmKLvk0PcDY3/yDrdOI Q+4+ba/TevewP13LyKlJuU2AzBbn9LXL6EhdSLzP9IBbch7B1fOZoHLYbwzEJLGxNb38 RRhQiYo7IBP2k34sn88yK/X7oX5RyNkjGqan2ZQNKMLZHfdXr1UiBkhwzS65W83B1atb kmfDjv/xR9Ls6Q6aQMQ9pY8mRlEKROjSZJ1EKvAlkbjUU4G7a9ii0yLqLYwgTV7MgSXJ JMVeODEUnbPTtl1udL7datZ7MVKPJGGsd9I7Bck41Ll/CrC8TCgdkGVe8LtfFBMJhcnO yWTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; 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=XfnKmDuPpCim1Hc+Fq5FVD0B/pdiBieMKocyS6xE9n8=; b=L6G7hNIkSutXKrbNQx1rIPZt1Yf9yffpF3yvdIhmkR1/J+/KBfpTi6VkG0/h85BZGC RtdoQRH8pmIdGL5JQH7XCHdlj/doq0Yh1wW9XEGmwaBvKT+AllxlcG4HlE94n0H7GlNa gz67U6HM3biCsnKKi+/dcNl0Yv8jPpPeTfH0/iInyxbvLlvmECheO7K7fWJrX768CcgX F8UYMlM9pNDPOklswc412Qty4O0EbpP9OxBEXIC205PKFiTqj9k/+uzzjd8+VyghXVg7 WpotMngcJ3MdV91Tmheb64w0fYivO8/FNaPAgoWcQIZHukeb7QDPmfo9x4XCPwOZKkHX 75HQ== X-Forwarded-Encrypted: i=2; AJvYcCW920B9JJRNHEt7yQV4fhxJJ+ii6SHBAsPlCdOwI7qV0rGJJRjnxR+HQLEPvNpDoMkplT11rtVK9xiiRWavNZMFDu3eWRI= X-Gm-Message-State: AOJu0YxNhg4lW+B41xk00csykQYO2h65CWk+4rDOVTuhQX5ZnaNfNxo5 6nLJAs0klxcn/TBY9Gu39oNKxQuPlgrP0nz2iLh74C261dBUAKgK X-Google-Smtp-Source: AGHT+IF+N9Uxijf7ktMPjJPuy629xy5zTGwJ2qDrN4ExEtpOWsxWBrbmf4DgbfSuWWb5eSKzjaHIZA== X-Received: by 2002:a05:600c:3ba6:b0:425:787d:b36a with SMTP id 5b1f17b1804b1-4257a02f9d0mr59001045e9.1.1719927515082; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b8b:b0:422:27b5:8466 with SMTP id 5b1f17b1804b1-4256bbeee32ls18967875e9.2.-pod-prod-01-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:4a16:b0:424:a779:b5c1 with SMTP id 5b1f17b1804b1-4257a0114a9mr60628465e9.20.1719927513149; 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=fSg2DgRFQEYDIPkskle/UfDiPYLLiHMKpm4u3pfbESzF8x61n6JYBFyOdjrgNNgeFf zSJMs2vlSt4Hx5T0JQj0g1JZguTXmuqGGnzIpL3y0D5V/S5hxJOKIQ9q7qDU2xPNoNth CrUDT8QcRxIFsymeBI5sapv+1ehfCgrTQ0Y6eMRljgCtTbkq60ejg9lwTaBeWLUCuZWS 5H9zY2faB3izARddeLYjEQTGEHa2eLEX0tYwigCvwR96CTnDtOC5sAS7d5XkeJMZGTO7 R/IojnApGCBO3k/DKkIim5SHGM5YJ44lLUcVWpdaLRtNBSL+XdD6hNOBjwbKykNgXcPc 8BLw== 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=N6rtmPrsZxrfLE9amlZGrYaXNofOOYQAx5doA8DG4ns=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=xf4LV3z7/kwXY4EpTStRA5H+UoBQTp+LwkSy4eFWILAPJDzkOB9xmzFBA6jw0hrJqT Fqy4O4kzhmyZZK+igB2HXi3/M1jeZcF6jdM9HO2i+koZe4L8tw9LDirXbDYdrir0EH9D WlUOb6zRXJCMwSAEqcEcThPgjISKcKNPxVnaZn1Ul4Yj+4sBxfYKzkj6nY3GtcQiX+zH Ky6Rx563J1RO7ES+jzAfFVIzBe3GQhO/63Vkyb4pvlnzrxf4PB67BYnOkx9Xw24hA5dz cmJNCk18Wum6tyiX7ksZ+NfvebasUtA+BS9pKW35L5hHMiuloodwjQPXtD983V74imON zSnA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=NEat2Ckt; spf=pass (google.com: domain of fm-294854-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832c8b1c19ac4189077d8-EHcdzl@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42577a0deb0si4303495e9.0.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-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240702133832c8b1c19ac4189077d8 for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 06/17] meta-isar: deploy-image: Improve root mountpoint discovery Date: Tue, 2 Jul 2024 15:38:20 +0200 Message-ID: <4f3c5e331c7d117a5066bb804e83b98a698427f6.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=NEat2Ckt; spf=pass (google.com: domain of fm-294854-20240702133832c8b1c19ac4189077d8-ehcdzl@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832c8b1c19ac4189077d8-EHcdzl@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 The rootfs mountpoint may only appear as /dev/root in /proc/mounts. Therefore, reuse the pattern we have in expand-on-first-boot already and switch to findmnt. Signed-off-by: Jan Kiszka --- .../recipes-installer/deploy-image/files/deploy-image-wic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d27a0189..f73a48a9 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 @@ -25,7 +25,7 @@ DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") # inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh target_device_list="" -current_root_dev=$(grep "[[:blank:]]/[[:blank:]]" /proc/mounts | awk '{print $1}') +current_root_dev=$(readlink -f "$(findmnt / -o source -n)") current_root_dev=${current_root_dev#\/dev/} case $current_root_dev in mmcblk*) From patchwork Tue Jul 2 13:38:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3643 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:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dce8j029395 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:40 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-42567dbbd20sf31379515e9.0 for ; Tue, 02 Jul 2024 06:38:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=ybEgN6YKmwYcZ/JL6lsSG2A1ERF1oL4kEziUj8AxCxQJpqhmjeC+nqEex3EmV8nyto mlYU5GNrOlZx+YpwzHqwMmfsosvEsdONiU777VqdjETRrV3VYeSnsM75R4Fx7xhgeycn cN33n8NugpCaGipol40RgQ0W/vuF00wSwx+9uRz7tX2JakPoxZZa5wyMIeZ/wilLd70v HpC/r+D56x7EvBPO9Zd7NWsAB4LBwbqjq01u7jmtoL63+2/l0d4ig9DF4/Wz2th/EoYn XMResRNRPMICLkqPLeEVhXWGJIGZtX55rPqvEKyagr65f7m7UPJDWiSoAlwmp9A6MCGz nQUA== 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=tyFEGWJxkGrSCptMBdODXirPzhH2vgDyVwNv+dOPWNg=; fh=8IQnAD7XeFgZo7I6Fmf9TZ4q4CYMrbuTI3KGppUdOXc=; b=JZMnXVydpL/hPKeDZTxB48LSmaTPpPFQkzOI4ZBC41tuaxNwepkiJeGHkdPN18/6Wc AavibCSmuq0KtQJ9I7KFBEA5UUMPTVinffgV8sPfYxqxE4hYA9Pu0vuxbE4+ONAwtgB5 vK6y/+jq5QP9yNj5Ozwk9O6+hOq3Ydj84547XwbtP3SpJqKyviJbLJpO5KXazVXnijdC MqktNsoiUKfYtboqsURt/IFOTAndVT9LMDfxfGi7wItH5cb3sWSmLV0JoKGLTx35kPZ6 lCHqTadU4DNFDchK3LjW3nG6GzwaI4RS/G3zMsesoFVLT0pYSS4kQ13GkoI3ZcfdWhu0 gMUA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=GEURARN4; spf=pass (google.com: domain of fm-294854-20240702133832a9bd763c4249d66f07-i_youx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832a9bd763c4249d66f07-i_youX@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=1719927515; x=1720532315; 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=tyFEGWJxkGrSCptMBdODXirPzhH2vgDyVwNv+dOPWNg=; b=VDC90Uin4FQH8peYGgEUL6JhhZlSK8vUm1jyQ7q2gthuDdy5S3Ssz2YGee/Ehw0H0v B/HPeqXeavjdVraSzFM88hieO9qtDsKkvYfmvOXCt+bT6SvkmRkd6x2RXmXc8kg9a8HT nnG3+QQrLp5xH1i9uA3xDaYEuK010b5ARlNr5FP0a+jbo2obaFpZGgBFkwXWOU1SUe/h pJ1qPxASFrLgQgyCEiAEb2FIbv5laCgQxxW/0DSRtdzEBHEagWkcR+PVkS/mhElUZp3q 364gC1T3LZZmt/b0mbRWnNi90UiIRjCc2/FotmDMF8nrpiI2+fgZLw1V1+YMST3d5DQ/ gQ+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; 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=tyFEGWJxkGrSCptMBdODXirPzhH2vgDyVwNv+dOPWNg=; b=YKRN7br90BItwWhRYPbKV6w26gEoQWYVCXAJ48xqBU/Rfp88TC8+sDIHbm6iE8yKJ5 Y8LBNZ8A5PouSOATch3wQQBXrLIl8WsZEIUzLir//M5Jz/LRIlKq4rsNR6CZRLbZ8SVg hHEj3eHZ0CpzUr66lILRKu1pJhda9H2uWm4zEZUUMFOwf1r+wZscwdaqmptIo180Th8d NLsEgtlxMpW16kChXxXSjgPbbDSDFn0prNgnPlzIsPxx/NlV55l6fbEdSJmWYkyu4bpy sD4IlzAoqyQmE6OlVopZwKZqBwASZckVhHkIkg4YXPhWWH1nkHeoX8eClzLzalgV2/k8 HaYw== X-Forwarded-Encrypted: i=2; AJvYcCVxtlCQIWGemgWO6xsWMMrk61F8d8nNq+UGNkRvFu8nOrjvdldHt2GmBuGvLr0KEJ3Xnk6EE80ZyN+YPC0+YBMx0erbc8k= X-Gm-Message-State: AOJu0YycK/yYlh0spLz5jIDkPOEi3H38ETrCtq7HE/JJpifZ98+tQyXD ORo1jNur/t9a8FPhFMZmnML0ltOU06OC+LI6TuQEvaWufAlY259Z X-Google-Smtp-Source: AGHT+IFSJwZdh+4tWuTw9XXhAOszv9dG5Q1h3xDEDKnqmLZRcrJKTjMi6Ax/kGphOGhuw899P+yY8w== X-Received: by 2002:a05:600c:448a:b0:425:77ad:93cd with SMTP id 5b1f17b1804b1-4257a009818mr55002295e9.14.1719927515138; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5586:b0:425:7633:847f with SMTP id 5b1f17b1804b1-425763385f3ls16389715e9.0.-pod-prod-02-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a7b:cb8a:0:b0:425:7aad:c2c2 with SMTP id 5b1f17b1804b1-4257aadc3c6mr56470185e9.19.1719927513163; 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=sroABHJj7aMXBHob30SI/op+6y6TUrSc+8EqQgPauBWM9Oej2waaF/bu+R1tMbFeES /vA4M1HLGRox+/P5mXaIzEWQ67Eo6770cKTUIJSGRgaRLDsZSI8s6hlRYBvw2scMhG8p pn14yXnM5yQLBs5L9IZjuaYWNoECIDOc/0iyCAGaLcRJrj1FnlgcbfP5NWPaRA+t0R13 1OQ3COO3q1vQIHXZWztAeq9sRgZahXo0z87h0MtxGccmqQId/CYvaC1QkMLxSVYyrAmD GukdyGWhGdyVACarFIERUok1NrdDM5gjREa+dQHo8i47MQO42aT7+evAoiC1xVqwCFGk WpHA== 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=M5EXTI+p2o6jdcoVWaXzPxyU+j0uAAl+3f2F3+6CHUY=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=iTkVFmxtcTeb8GhgBkTSQ9bZGdL0T2CMaik4ZIytzRC1OGe72YFhqEb788T59+nzNx RAZ+f26rPazmtqE8vA8nWJzYIVd1j/HRLbMkv+fs5RY3t63S0f5FCz1LLBj7CUIXVsHa kfca35BldBF89hMadbElvkTMMnlZs9htSVXXD2YO+CWYEwegxhS+ITltnQvYlMiMIo4t 9iXVG50uUAzUSccwQfo/B7u5RsiF+3dABeJ0cHYfn9u5C4us3+Y9go1+RPBM30BCsXsz mzhKQLVBIJSaWEOXKc+PZ3DeV0bYPnIELQx7bsfadJWfWDikHrJiz6nCH7zTPd+wMY1M 08lw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=GEURARN4; spf=pass (google.com: domain of fm-294854-20240702133832a9bd763c4249d66f07-i_youx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832a9bd763c4249d66f07-i_youX@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.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-20240702133832a9bd763c4249d66f07-i_youx@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 20240702133832a9bd763c4249d66f07 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 07/17] meta-isar: deploy-image: Make TARGET_DEVICE a complete path Date: Tue, 2 Jul 2024 15:38:21 +0200 Message-ID: <5325fbed9d19e6680cc4ce49eb1608c29730065c.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=GEURARN4; spf=pass (google.com: domain of fm-294854-20240702133832a9bd763c4249d66f07-i_youx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832a9bd763c4249d66f07-i_youX@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 Avoids having to prepend /dev/ at every user. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 8 ++++---- 1 file changed, 4 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 f73a48a9..5c362bcf 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 @@ -78,16 +78,16 @@ if [ "$(echo "$target_device_list" | wc -w)" -gt 1 ]; then array=() for target in $target_device_list; do target_size=$(lsblk --nodeps --noheadings -o SIZE /dev/"$target") - array+=("$target" "/dev/$target $target_size") + array+=("/dev/$target" "/dev/$target $target_size") done TARGET_DEVICE=$(dialog --clear \ --no-tags --menu "Select device to install $DISK_IMAGE" 10 60 3 \ "${array[@]}" --output-fd 1) else - TARGET_DEVICE=$(echo "$target_device_list" | tr -d " ") + TARGET_DEVICE=/dev/$(echo "$target_device_list" | tr -d " ") fi -TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE /dev/"$TARGET_DEVICE") +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 bmap_options="" @@ -95,7 +95,7 @@ if [ -z "$DISK_BMAP" ]; then bmap_options="--nobmap" fi clear -if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then +if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "${TARGET_DEVICE}"; then exit 1 fi From patchwork Tue Jul 2 13:38:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3657 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:49:42 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462DnfZV030470 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:49:42 +0200 Received: by mail-lf1-f58.google.com with SMTP id 2adb3069b0e04-52ce324c204sf5277139e87.1 for ; Tue, 02 Jul 2024 06:49:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719928176; cv=pass; d=google.com; s=arc-20160816; b=oILdo00GdS5+kEVYEkrmo1UMo15EYA/MOZ1wLAgGrINQ/6kAeI57xXHASXcz5ylHx9 KxheUY191jXm+CHd6oQwu2nHUc5OMQLE/Mmf/7df36UmUo4WNNSy5OArGlQjos8OBhsW kiVZDJ68vSBoWNii/4MVAH7ehXhtjaCSZLWIx18NQGfWJxTr3ePmQ80JqMByfu55BBvF JKtJfIlGTLCzCT5uusJMnZCVavZg+HrmMPqdIlvmIy21D2kz51iC0RYQs4S5xcRoBZPu sHxrkAuQpnzawG/locaYb2lhqkC2+g+jxBJ7lxBY1/T7dWxcVV8939UXoOyNhxxl3koK UN9g== 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=VrIZM+2ZkMrm9q/CNCDqSOvvjcplaAwiHYJJ018Cado=; fh=OMoqXWv5fD6ovyT4gbgczSAizTxspCoYL9TL46YYUZ0=; b=ZLJk/t83kOk4hBNNF2t6+DiFHX7EZy8K98C7llORcy/J5h+9YNYC53BRYCguMb6cw9 o9f69zAPISx4qUPGZBWk7AqMeMcC9qektOmiPfaGOCpfs6At1oyECXFnfV/nxYMrVtVw JqMgRKH6rQ45/9q/nribiR8ZNoR4nny3uRJKfxtwqh/0EMGbCn3dZXDGfDHRKUC78KwW 1j5NyhRaqlAUoUwmafhM1eP7rXNRGlHH7xxmLt6dFGpZOh8AKamu70sYn8q7F4NdQ+8C T9z34bVGZIaYKhR/6rnDfkrh4AgPzo4we3x4p6XaymlV7KOCZC8ZZsXe8QF1mAqIDYGo GT9g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Z5UZL4bf; spf=pass (google.com: domain of fm-294854-20240702133833a2f4752fe0ce9879f7-8o_n3q@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133833a2f4752fe0ce9879f7-8o_n3q@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=1719928176; x=1720532976; 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=VrIZM+2ZkMrm9q/CNCDqSOvvjcplaAwiHYJJ018Cado=; b=GzzVl8KHg5g2lN3TtJOT8hGBquF/4jvTqSEq8DMHe/pzabiN9ODExp6u2OvOkUySkP BTlb/6KFg05zz3/RtuVeU4UEe7FB7X49r31IzWzH+nih4tjPJfAUjI/rySR0z4j6md5s I95y8EQ4KRpnk93Ih2ViFxir0fqM7GeEeMcdGhuu+MorIVv49m9yYmfxFqtnLu96JyMc 1OVrifLD5zwg6VAU0ZqsYRR4fdnK2flBIPGjUtRx1bFkY8Jdziii4YMbbPh2VhPE7VAl NCHMRJWuCDNgNZxOw+oI028BEd1GlLUnm5zzyuyQnL02lbmolDMr9tRjKZeEXwb3+Wus yE6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719928176; x=1720532976; 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=VrIZM+2ZkMrm9q/CNCDqSOvvjcplaAwiHYJJ018Cado=; b=Ele+3yp23hQk+P0gohXqgBxOTnomEOxmZKz4EZenY2OaIJc1CNFfd+EwubvqxGzY7c 7OfoNa8QlFxW0F/z8k73uAJF71sgbgDNnWzPMeBSuk50tgQKJL/mB3PlPCMlPEsZeA+2 aJLmaoo+2OHi6j2eZULwtwTkWIYRqjiOhFg6njS9mKVBeWTu4e0CT3Q9aLhzo2JjsAAo eJh5p0Q+s28k7bugTbqRpjZJ2tYbUtg5RSYLkoZE3OSYLRh1y2MvERJjNu2DbAlANIy5 1h1nvqXg8FXmQXwj05izKUY97dYBU38rlyYi31CiWgWDY6K/m6afYkcgYrD6Yc7Md1fw ZXhg== X-Forwarded-Encrypted: i=2; AJvYcCUxdSwJBafi9sq0yVs3ohlXl3IAlT6YcCFr1D5tKvQvfpfqW8AQuJzKQ6womgqpIEp/7TC33yEL0mVxYToVVGWldkaNNvQ= X-Gm-Message-State: AOJu0Yza03YrH1k0jJ5h78zsJwqQSgsP6yg0goYrRMqDjcjMvOAv78Xp EjgGaJBon23AHTkjWytOyNbzIAJfNCrKOHpq8QGt9XcNvfEikMjE X-Google-Smtp-Source: AGHT+IGkY5VyQ76Yi/XzXZwTIRKsrH5hcaiCReVX7CS06nq8iglkf0p0rARp8rJVkvyTWp/GBPBsyA== X-Received: by 2002:a05:6512:4017:b0:52b:8ef7:bf1f with SMTP id 2adb3069b0e04-52e826662c7mr5676937e87.17.1719927515684; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ca04:0:b0:52e:6e57:6ad5 with SMTP id 2adb3069b0e04-52e7ae17096ls2436818e87.2.-pod-prod-04-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:6512:b84:b0:52c:820e:a7e7 with SMTP id 2adb3069b0e04-52e826fb7bcmr5770371e87.50.1719927513347; 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=mPZGGblzqM0wjwuQRbKEGi8eXUmnkShy/pdD/jcVv/lsnp5/4JUpy6YdjJcSxZByCz fmVxfme5wQmuyyCpUie2m0floDJ/DgMuubAfyPylsVZy2wV8v6kqlKVuoYwKH046tRXF SBb7eVmp7ePDUFsZaNBQ+fIq4eca8whRjsQJuvXy4AAPNVV9tHq+fzTyQ6M8NtKU81W8 ze4RErUJykNChrCP2Jc9Ig3tz/jg526wzmEzkaQyZ2UvrbwMCsOa8+ViCpXkgxlASTk5 ltzR3iCkOCq441h6oWjq0D/jQY+tgJDqAA3j1WeJGUzhir/OIpaTvEEeov3Zt799MTXg heDA== 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=vkqeQyeMyVuUTXs0PhuDr/R4/aqY3X1BcFXFpOAie0Y=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=e2Xwm1eJU4vUhLJe/5jmoqPdPHgqcpWG1+Yg6VkTfQZfdKJpkU0IrUccE8qelV7Uo1 ojc7QPGHP38jdsGghQHcYJPD8T4W9nvGk4UG8bNdapI+hm56U+joygvcxaaNw0pIOPXo W5jq8HTgqVw0Dn5MZK2qYLHW+Ah/mnhd3ljGWKMPf7VPeqZKnzu9C4rukXOHxFdYEZJe qZQ0q9y4/HLHe7k5aIoRVZfBEG3obH6ZeWaoFQENWr6TCF0cNe+CU8G3qjjjd8KBfNt1 Ubp/vLRTQZN6c2+BmGNr+pn5hnksrdzqs5nghsd5zgdH2IB8hWOpCHWv8UDqcr+u8OgK p5Iw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Z5UZL4bf; spf=pass (google.com: domain of fm-294854-20240702133833a2f4752fe0ce9879f7-8o_n3q@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133833a2f4752fe0ce9879f7-8o_n3q@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-425788015e4si5278465e9.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-20240702133833a2f4752fe0ce9879f7-8o_n3q@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240702133833a2f4752fe0ce9879f7 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 08/17] meta-isar: deploy-image: Drop pointless --clear options from dialog Date: Tue, 2 Jul 2024 15:38:22 +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=Z5UZL4bf; spf=pass (google.com: domain of fm-294854-20240702133833a2f4752fe0ce9879f7-8o_n3q@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133833a2f4752fe0ce9879f7-8o_n3q@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 We are not using --and-widget. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 5c362bcf..284252fb 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,9 +12,9 @@ if [ -z "$DISK_IMAGE" ]; then shopt -s nullglob array=(*) shopt -u nullglob - DISK_IMAGE=$(dialog --clear \ - --no-tags --menu "Select image to be installed" 10 60 3 \ - "${array[@]}" --output-fd 1) + DISK_IMAGE=$(dialog --no-tags \ + --menu "Select image to be installed" 10 60 3 \ + "${array[@]}" --output-fd 1) popd fi if [ ! -f "$installdata/$DISK_IMAGE" ]; then @@ -80,9 +80,9 @@ 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 --clear \ - --no-tags --menu "Select device to install $DISK_IMAGE" 10 60 3 \ - "${array[@]}" --output-fd 1) + TARGET_DEVICE=$(dialog --no-tags \ + --menu "Select device to install $DISK_IMAGE" 10 60 3 \ + "${array[@]}" --output-fd 1) else TARGET_DEVICE=/dev/$(echo "$target_device_list" | tr -d " ") 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 From patchwork Tue Jul 2 13:38:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3647 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462DcixE029449 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:44 +0200 Received: by mail-lf1-f57.google.com with SMTP id 2adb3069b0e04-52cd67973e0sf5638017e87.0 for ; Tue, 02 Jul 2024 06:38:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927516; cv=pass; d=google.com; s=arc-20160816; b=VutMJwkY9fGSY1axymgKgFCIef/1y8CTEixxSYPcNVToXV9tkq4OA/lFgfiyM0mku1 6kMS2b4/DO1tirRQDfULWNEz0yHOnPa8BmV/HdMVqju/A8+RpaJhO85duG4uTlSjaN6Q b8Jho3Rkzx1Urw8qC1stQSDLYcqQH9H15rZ5On4Hg5VuSgjwavJ+e0DdP2jCSiDiDt0L y4b1tp1S7tathVtgJ82d9B/P1Sr3vKB8mnvyBJgWOvHXxZ3EHPUy6htUvyvIsuKVAe4u 5MXXGAnQhQHEl2fSBGv2udkDGGgQwUPRd7h2DyHg4qhaK6jGMYheer8pJhRcUV1CzRs0 P5oA== 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=G7RkOuNNRcIUFKsFs5eQLWDxaf2wT/7QNCHjplVs790=; fh=R7pUQ8ujS92nX2i1vjJ9S1Ywiui89NGxFSfvJwYd1QI=; b=d4azFQdsgNrJ/3TesUbFOcb+sh1uKijym5rklgx1FrPE2rdD4SXi3PfJgWaOJyjaCa aEyLwgDqofvhQ8LtH710qZMnqRYOiQztT9R6e9H4/9JsJ9i9VVspz/+Ytt/bqeinNfKm 4hqUCOG7IAaYHBYIta8ka/w5udUWAtHCBdm6+vwMhJTgD7agX/k8OF32OXMIvvRu+O9K XacJhcWRQm1yzLrZKxwRBl1z4lQrxygNu8vyAgrNhRc2bpxRqBwk8lTKUHSwIIehaIgl yFRKPTZ7Rptn+9DPazlE+LgZZWeViC6TQjbROOQqsAolO+aMcDb3sx74+VEFbvEx9hja somg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=ixIVJzL5; spf=pass (google.com: domain of fm-294854-2024070213383338b119a019250e89ca-53dcxu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2024070213383338b119a019250e89ca-53DCXu@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=G7RkOuNNRcIUFKsFs5eQLWDxaf2wT/7QNCHjplVs790=; b=REVkmAUARqPJd9fGSYay3weBUxGi7K0JbJQk3sE4NpUn7MTN3FCkfFN4bt1fBnPotJ cP2ZARdpZ8kuBrU3uZxKvrYH3TkjqY4PHLiIOKvlG4ZrnFchKyD61Zaruscv6nRZVclm idxnxhlPp5sodG08ZmXZg5FlisDl+xeo7NA0IkIEIbR2bH07w3ylWrW8BDw7cqi/PwCX jimURdVaH7Oc6la4WDGyJ+XQGvPMUxsi60liKB9PipdioP48fixIIYDDtAnwxU8/oAvf V9iYr3F40Kgzz3pf5mYXQNbloOT7iFRMnFEcG62qxDblKDYGgXFw4LbHImRTKEzX9hBb /G5Q== 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=G7RkOuNNRcIUFKsFs5eQLWDxaf2wT/7QNCHjplVs790=; b=Ioazd1nU9Xunn+l2zXX4YIsQySBMdC7juRaTYBKzDi8iy0FU7rX4Lg0STOnVqecHCQ do5+LEm+2mkHFR3+FcWoW3u+I3Muj6Wrmzzf/jPcApS9kaZshAHrOLSOxrYV1ZJJWscj O7UuYeMDD0i1OJ2kwDh8WDheXj0+GF1cCNKmQfCiI3ms1oewey3dW+V3IcM/9QVJftgO MQHwUbBRsonc9l13CrZw/4h8J7iXT/OPNafWrB63lahSJ9UkCGWwM9PVbuUwfL0vX2Or R8RD7gzViQDjlkRbPNCyiOwNMx3a6Tx+pdrGiVmT3kq9PTMmAO/DYpMbSQGnvge3+F1G EmmQ== X-Forwarded-Encrypted: i=2; AJvYcCU08LQwo8Vij6fkZdbSQ6adLVWhyS6gOpxQMDXvFj/RHeshARJv0QB0PAqpzh9c9OnNJq05NRmV6+66C9YveA9e3jf/X8k= X-Gm-Message-State: AOJu0Yy9lRxOToD2ezPwS1Jp2xGy2FtdOvlKbv9cg37lRQQt78S9xCG2 D6JsIxRqvAE+IsrtfhkxjAu44URlVjlhNaXuAvD9iY80uDkwrxB3 X-Google-Smtp-Source: AGHT+IEeq4DB7nIpbd3vpT6lYeml7A7cwlKeerqlcNoI7dLKqMjF+YPaWlcRn/utsgvkTjtkPkGKJw== X-Received: by 2002:a05:6512:31cc:b0:52d:3ada:4b6b with SMTP id 2adb3069b0e04-52e8264b5c8mr8495454e87.1.1719927516272; Tue, 02 Jul 2024 06:38:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4579:0:b0:52e:8328:e0ff with SMTP id 2adb3069b0e04-52e8328e2abls1604615e87.1.-pod-prod-05-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:a05:651c:1546:b0:2ee:4cd8:94b6 with SMTP id 38308e7fff4ca-2ee5e3937bbmr80697531fa.15.1719927513943; 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=VQN0lvml7oIPL500yzls6Lr+EQLrHdSJL01VXZTv20FXmxISD/Xo/GeBba2aXYKKqz 9f7ZopsLjacG2nfWMFw4l7mCDr/edLlMOASozLsUqst9Uhz4CJCjRXfomVNANrDwfiyl 7fyYwBm/BfWSl2e6VNoyfeSZNq6+9Uc+8MVcw6VAg382sUOZsQH9reMIBWq2GuYeuAI2 UZrbvcPYj7/ZQ+tIoAkVQAQbb4Yg+G9qjqGCOcUA7fbhx03CmyeQBkk7htxdr6W9zjqx HgplFKfycBq2ocx7YWRStlKLFR8aTYpVErVgW8tCim8+hdvw7kGV0G0DdAD6yrnmQzrz Khew== 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=5kMufvGp+pidOntNBuaxH9CpzqI/xjk8Av1FXXzHqMc=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=CE+gPSDTY86BYFOtqZ1aZgxh2cu6Rv+JxI+X0KEVdwYHPxKWmTSh9ASOnWW3lCkkIX XqeUWTrEtRKebjj3tMmY3DsuGYLYHPryskU9G8SYTbwX94147fFWuMp+GyELjsJaPCqH jl2TetHB78fHf2ZiqI9OZRrkcsMVgqxOA3tEHPKpJcg7zLtBGQvKDGV/N42HQW2d0PF3 YPA95Cl2MQfifM/U+WoLMk9LV7TrsHod7IZKhVVy4cSB3LO8IgaqOzOK7lk7Ps8mCgGV HtsJ3Pb0xDzGDmXQUICE7PbBpSMYiprhflaSiw4O2RAfAlKfXa9ngCzENhwBq7xz9H3S WwSg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=ixIVJzL5; spf=pass (google.com: domain of fm-294854-2024070213383338b119a019250e89ca-53dcxu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2024070213383338b119a019250e89ca-53DCXu@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42577a0deb0si4303495e9.0.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-2024070213383338b119a019250e89ca-53dcxu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2024070213383338b119a019250e89ca 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 10/17] meta-isar: deploy-image: Warn if overwriting a non-empty disk Date: Tue, 2 Jul 2024 15:38:24 +0200 Message-ID: <76e3eff93cb07536292fe39dd5291cb744f94e9c.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=ixIVJzL5; spf=pass (google.com: domain of fm-294854-2024070213383338b119a019250e89ca-53dcxu@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2024070213383338b119a019250e89ca-53DCXu@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 Check of the first MB of the target device is only containing zero and warn otherwise before overwriting potentially valuable data. Looking at the first MB should cover enough partition table and file system structures to detect a valid disk. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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 09d6cc11..81a006ce 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 @@ -96,6 +96,12 @@ if ! dialog --yes-label Ok --no-label Cancel \ exit 0 fi +if ! cmp /dev/zero "$TARGET_DEVICE" -n 1M && \ + ! dialog --defaultno \ + --yesno "WARNING: Target device is not empty! Continue anyway?" 5 60; then + exit 0 +fi + bmap_options="" if [ -z "$DISK_BMAP" ]; then bmap_options="--nobmap" From patchwork Tue Jul 2 13:38:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3655 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:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcmf0029741 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:48 +0200 Received: by mail-lj1-f191.google.com with SMTP id 38308e7fff4ca-2ec72d14876sf36889831fa.2 for ; Tue, 02 Jul 2024 06:38:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927517; cv=pass; d=google.com; s=arc-20160816; b=gjFFyMXC2mhDxo71OXow8uY3fatbW9OtFzSBimvPe8Wrdq0H+w3cpHIey1iphkFQtq RX8ujxHA/zo9kqel6yaWBmNdGq1EMkIbe5deaOjHuczd0D0kp8wQvr239CRNnb1OcAh3 ionisLJQL3f6Ci7DQ3ed15Yx6q53VQZkhz8VnYRc2MH0FiDBsc/LinRLQgBXEtPszSBI iYBD/KFjK5qqc2EeiUdj83qgS8OlrlDMm9n5An9Aam95R7DpZtnNP22SQshQY433FC4g qiFkw7sPX5c5d78LB5cEAlTL3TAXlCrkp0ouJWrgDp+TnJFpeFYc8ok2ulwdBzptBwdN ifZw== 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=j0CwWCPzTBi+eIi59kS6wOQvB2oatLi7BjMQ9d+3oQs=; fh=FmAzeWNu+p3Le5NEj3Vcf0zIbVyR7K8HvcVq2mcnd9I=; b=Mp6kUXRNRohWZbNI+VEGZepmLNWpp2Ax+IyU2gcY+kTTId0GZNfanxXi5Ci6DcwXmF qFQXXyhabpvZe2wo6MiGPzzkgvgpbLk8jcmJRRkvx2ibWYDl1qNXPeZA/RP3zDK+5SpT QLGft73wIlyryYvWYTSOOoykbX5D6KTWPY+5Rjh4F4ET1YA7bTjvyV+cFRy6U3IfAlvf q4uybi65MpR5p/IDe09ZhW0eCRUHzU9tTW+XAkV3iqHVYfLpnny4OAP+8DcQo3sEafv5 hZcPaqauNFMAWkgv3x2V/Nb+++i6JnlG2eNUT/pqwxpzsInXvBE5sO4iQn55zoVQXj2F e/zg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="lykTAV/o"; spf=pass (google.com: domain of fm-294854-202407021338333535d6891860004e67-eafmkz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202407021338333535d6891860004e67-eafMkz@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=j0CwWCPzTBi+eIi59kS6wOQvB2oatLi7BjMQ9d+3oQs=; b=nRWZYRRx02BrMV35/+LKEAC8SCxjAEYUL/AaHbMCIjalQYTaQgzuYnVV2GUwXXfEfp urdJKjBk3HCjBek8AkVhRTmxdTZs4NLyjIjglIOuTLV9iBZZuzZuynZuMhLxkTEvsyFO t4+VCz1IjXhFNDfuB1rV3n8HzBkC4aCf1Wbi7lG2LTbzem4QfeQ8UUM4tewHTb1xt3N4 JtlNPTNC3s7Oa/+Cc4o+ojnL1mk8IZ//DLWX5O54YnDS848DfvjTphAmhbVL6H/btlWM tnj//+n+CemNsdl5IlLADHRQHJ9VGjrO7EJNHpazKPy7+5JEYZ3Y/ixyPSmhL7Sc48du VE7Q== 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=j0CwWCPzTBi+eIi59kS6wOQvB2oatLi7BjMQ9d+3oQs=; b=f8Cc9wdD+sviiQplS2jshMkIhVypabGQTrNNKLG2YSWmXsPnBhBkV8C6Aa7G5C8jTZ 4WywggZ+yRWGU7H9aDzPTGGeD1N/irn+AOaMD7ygz6xaA28zEZbIqO3+iH1pkADJwxWE nAaj1eQ/k0tMzFcBOp+ItcFVjMf7UNKPWXJiVKHwH0CgJzFfl46GThx2whfpn6/K4/JI lFRMzYSWhCHg8Q86q+PZPwlrwW0QIZhS11jJBQxtZmWN+Ah0Kz7hBWkT29MepWJHds8p IGGmRl3qQm311u80Z8daaYZ35l66cJFHZCPfWl3BWWpfh4yrMC74LE4MoNLPUSygBQaW j6zg== X-Forwarded-Encrypted: i=2; AJvYcCU6WktS15MiU/crjqTiWHI5niFI2xCy8+YsMUTXvsH8THHcvM36XtJdMu89n/z1gn1ngR0Gs8WGBU48TGXt01qX+D7DVR0= X-Gm-Message-State: AOJu0Yy+N9FXkTN5Vjy0oMjFvlR5C/Qx5ML4ZvQNK5Rm7ifwn7Q+yF2q mkGOLzMgBl5JxpERo4lM2SsDbQidYruKJ66NzEaAcP00ZEjz2C/M X-Google-Smtp-Source: AGHT+IFIbISMtokBlH9K/w5vsuxjx5LpaeScpbfeROonRavJHRO9srLCMDtvKqZtDRFFdNYmcriWtg== X-Received: by 2002:a05:651c:a0b:b0:2ec:55b5:ed51 with SMTP id 38308e7fff4ca-2ee5e337c56mr72056301fa.9.1719927517331; Tue, 02 Jul 2024 06:38:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b4b0:0:b0:2ec:4d9a:63bc with SMTP id 38308e7fff4ca-2ee52fc61afls21158501fa.1.-pod-prod-09-eu; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-Received: by 2002:a05:651c:1a1e:b0:2ec:53ad:457 with SMTP id 38308e7fff4ca-2ee5e6bc2b6mr69448771fa.36.1719927513944; 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=m3PyB/P7P07jtfek0hARPYCit0FTuj6qBXwU3o6FeXfT5n8kzVf28MQMhaZyE3hj10 YaqUxWwt2Lan1rpuymJWMfCDnlfGSd/UI3EFoaEjk8GDpP5mTcMB6lt1RdMsRz3huUPA prvnY03ZiCm0LOvUVA3zXXwQvFyrTZmLsTdxLTPbc9EfKs82bWCpjbN7WzqScsawvhd0 wv7CGfvFW57Q4pSAdqnvYvOYqv1Irnajc7aNeZgGu23kQPw9TTWqP3AFmYh46a/bMnnp +4pG1PJoO14fSYKcPZDpj0f2nNxGtWaJtHQCjNv46dxHDaAtP5bzaygzWLO2SpwqHOkU DhwQ== 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=wRN3nktX6j5+m8UyB2Yzk5bA6kV8kMUrwqcel2ydmbo=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=oh8dwapqk74/OHBIaI0x3LJsdmrQwQHj57WmM2oJjRYAOfeXCgHGOmi79g5pUyYMyc wdGXpsLG468mfLrbMNzYGvAp2xCKD792EvXlqojL3jgJ+FsUQ8B7/tYUc3D0kmT7Rgij eVI/94X/bagSU7BN3GKgJP7MgZHSnEzDkYmqKWvUz3bMTG5fXD5lKtBZ/nG0ao6Cx09r iCl0jrowpHO1UD8yxFB+yKNN3j9s3r3S4Ma+jqQh1o8RpW3xA6Ch6GyFtU5KXzP0Br5u Goqv6YBN9jX3rfAUf8cYSW7bzsI9FoSEzIrLBFpdy26AoxXYhzSZ17xUBLVFqQWMr2xh 5w0A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="lykTAV/o"; spf=pass (google.com: domain of fm-294854-202407021338333535d6891860004e67-eafmkz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202407021338333535d6891860004e67-eafMkz@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-202407021338333535d6891860004e67-eafmkz@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 202407021338333535d6891860004e67 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 11/17] meta-isar: deploy-image: Fix and enhance image selection dialog Date: Tue, 2 Jul 2024 15:38:25 +0200 Message-ID: <162026333e672018b2286d379fd9e88ea7792ce4.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="lykTAV/o"; spf=pass (google.com: domain of fm-294854-202407021338333535d6891860004e67-eafmkz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202407021338333535d6891860004e67-eafMkz@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 The dialog was broken because an array of tag/value tuples had to be provided, not just a list of files. Use the chance an also fall back to the dialog if the search for DISK_IMAGE does deliver a result but not a clear one. But only open the dialog if there are entries. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 18 ++++++++++-------- 1 file changed, 10 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 81a006ce..35029728 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 @@ -7,16 +7,18 @@ installdata=${INSTALL_DATA:-/install} DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) -if [ -z "$DISK_IMAGE" ]; then +if [ -z "$DISK_IMAGE" ] || [ ! -f "$installdata/$DISK_IMAGE" ]; then pushd "$installdata" - shopt -s nullglob - array=(*) - shopt -u nullglob + for f in $(find . -type f); do + array+=("$f" "$f") + done popd - if ! DISK_IMAGE=$(dialog --no-tags \ - --menu "Select image to be installed" 10 60 3 \ - "${array[@]}" --output-fd 1) - exit 0 + if [ ${#array[@]} -gt 0 ]; then + if ! DISK_IMAGE=$(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/$DISK_IMAGE" ]; then From patchwork Tue Jul 2 13:38:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3653 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:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dckmc029561 (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-f61.google.com with SMTP id 5b1f17b1804b1-42566fb83c5sf7140975e9.2 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=OZ1FVNu2dUVvYnTTVYyXtdG1DgFoQJxoD15fH/Vs+s1Ze/Rj/d16VSbxP3D5typ/7T As9drQYFLDppvQYIanOtCb5ps5zz+CZfWSfypMikYGZOi0LRiNMX4YZSMAg2pE52mOxn h/ho5T/RTjuXdv5HlldqhYnPS58/sJ9Q1n+xpr01Ww5sRWEM2QxSIbhiERGSWWZOVzie LJIP4NGUMVlxFlkilfpzD2kamHzPqckyQly23m6meFAPWchFtZO5uXM26FulKp5vRJG+ yUePwJV/0cpCjh8aN50bNE2ob/zvb2xGX3Imtje3NgTerIiydP1JCDy8vmd6pe3fzpHV khGA== 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=u7SeSXqXmIXecWfkRayVIT9eZt13l/VdcGIYRy6mJxQ=; fh=AglkW81VytrYJENyWiZLapV/t22ve1AzPjgf1/t0EDQ=; b=kgeXk3gsqUANSF8BbCzFfyHsprzX86uDJVoTZp+y/PY/Zx2OPFO9xIEOIgPjJxCaOb FErSsDJA8ObwV8imwk90yqQAQ5mmCfcDQ0WnyHXs/F9vAtDtFg5qr5sxXeyo/X0o5NUu 74TZR3TiSOgtDxkMkgJdZK8JS5T/UGuZW/pFDvlCBJUpFxSiKILG9ofKUjb3WyA0WriC cFsBDvyUpILpiPwahU5BDLlqLtvF92r4s29OwJz3SerjnZ61OVZVOHgB4g80eVFd2U+o lfioBSRdGHFLTXfe+9FulV+Yg45lDkx+VIb3Fbam6o8qIULousdISt3y8RR2/99GJ+rs OU/w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=f6HNJtd0; spf=pass (google.com: domain of fm-294854-20240702133833ac4f4bf762155cd973-xg2zvw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133833ac4f4bf762155cd973-xG2zVw@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=u7SeSXqXmIXecWfkRayVIT9eZt13l/VdcGIYRy6mJxQ=; b=ipnku5/cxpd0Ka7tJ3slR/ofYb5IEJ4DQH6bTeaJmLRNQcWgI+mQtkIEob4b4STOiw 3+rAqXpPWCp7rp4LtAixXpoZPP4Au2SbVIVc2WkLJskPJtFmijCQFWPm//LwJwm012iW QtsScDbaUzNSaBQKLOE6SWc1XLFSkiQpz+BDyd8gawI3tLFEf/ECW1EZR7AyMO4nKoJf NA8tgE6qhnJj1no0OR+biMw5XrD8RN00Yk/x8JdGKfZYqeEhoE/6jiA1f2ED3e0hpiWc wI7ltecsC584ErnNx2rsdueceSpf2FAR9MUGTT7pRzsYpOk1wizDZmUkg+KBjfl0MQer CvAg== 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=u7SeSXqXmIXecWfkRayVIT9eZt13l/VdcGIYRy6mJxQ=; b=lqrvFzFiv6kO/aNm4yyJa9BVK+03UmmdDcaGWAOHDbeP6s2suVHD3YEBIWYYHlZVZf 9KwMbpl49D0+E0bwoWjx+o0O+OR7OqU1pKw92FLr+gggFdVvZ0UHmFMFe+rBG5CE8O3r J9EspB7J7IqBqVE3GzoWIQihJ7A4Zzms1r6DUvE1efEy24v94kVD9GtTwH0c93/avAiG lyHO8VcauV8f1Tf/k6YMvlElxMWYNrQT2d1P0TCSnY+x/yL7mLlagQWrXZqPg+HdC6Ze CC+fa1y35atxnjWQhoEjRxIHL6qU6EBa90Sd+RutI4IVkuobzrMxeErmaX0p/VqswM0d aK8A== X-Forwarded-Encrypted: i=2; AJvYcCUynZTr3yA5x63W4vUUrxVg8fFIAF475cRNxnUOadMj7vAjMoELEPMrfktPyAkXklwF8gzyvuG1fg10eMMkxWC0VHgHa0w= X-Gm-Message-State: AOJu0YwwFpNCld5ynGZGGBrzqbiszSZpqLFC9T/lvFCAjaDw9eHqr8s+ jWUcx/m0A9t35As6kTl0rAPVqrG/mYiVw/U5s4ZaJFeJ3GpF2AvG X-Google-Smtp-Source: AGHT+IHPjZ89BsZESnk95MmVdQdP9ZiXoaleXEskuXxXNguTCU6bZ3qCUlw3Ge/Y2lFK4zOp5aBkUQ== X-Received: by 2002:a05:600c:2e49:b0:425:7ac6:96f9 with SMTP id 5b1f17b1804b1-4257ac69974mr55617145e9.0.1719927515963; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c07:b0:421:a575:99a8 with SMTP id 5b1f17b1804b1-4256c1c7067ls21930105e9.2.-pod-prod-00-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:a05:600c:47d0:b0:424:aa5a:280e with SMTP id 5b1f17b1804b1-4256d4d3117mr105807165e9.8.1719927513894; 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=JRpaxbrwOMm8BdK03hiZpo3+FSCTnfbpMRGzns2hp5+Qzg/uE/kg+RU+gMtv/r4Ft2 VhuaKWxadm8Ga9+kGJUBcUN5Xef76vCgKa5TykjBUpqBiL8MlL51G7eEZjIiiU0UnfXO 6tZwJIaGA7m9QSDMkBG1WY7U2YZtWrzV31zOm1mXuZZuZV7im8fjYYgr2ZUnB8+KwvHn kIQwUiKFap2PDkrVjOmw+hZtZj18rrLFTG/NgTxC61hXwxfYqH+Oh+nPTSXrpf9VW3Dw 7NDnN0SYeQp6Oj/pWOfSPLZhpOsbwj43250xNmkplQvGnB/0glCXEVlwsA2NZxU47E/0 j1pg== 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=X6YlzVNV7WoD0qOJd9kRd7wiNN0kYOErySKQR5E5n4I=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=jbMsXxcMzR3sPUR5gNPuGq8O7tczeGtqBGIZi9dI+Lbp90PuoHy1lDMPcJ5fWgLmMm 9rTZr6TvBU/9AQtZjbLNJLtielcOmH+rY5RUyqi8pACihQ44RPFS9a7ngqfK4saVsQJb 0IZBaAvYkZnLwNl5yBMFB13N4zbB7Bvdw2V2HFZnazL9LGVM9sBNkqCHaRkCLI/N+LDa 76WzKmNcTLIOu1Pqb+8Ew2tan2hHeHjlKApa2lZc8q4+/fSG/30iE7eiawpT3VcdyU/W KY/1sEpytOFxGQZ5TbMuBco93ekW3FwFaLp69A3mUNnQaFRfD4Y5qQVkt9eFQ5Rrr7+2 SSYg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=f6HNJtd0; spf=pass (google.com: domain of fm-294854-20240702133833ac4f4bf762155cd973-xg2zvw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133833ac4f4bf762155cd973-xG2zVw@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.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-20240702133833ac4f4bf762155cd973-xg2zvw@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 20240702133833ac4f4bf762155cd973 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 12/17] meta-isar: deploy-image: Improve target device list dialog Date: Tue, 2 Jul 2024 15:38:26 +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=f6HNJtd0; spf=pass (google.com: domain of fm-294854-20240702133833ac4f4bf762155cd973-xg2zvw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133833ac4f4bf762155cd973-xG2zVw@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 Sort the list by device name to make navigation easier. Show also if a device probably still contains data. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 35029728..673b2eb3 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 @@ -80,9 +80,14 @@ fi if [ "$(echo "$target_device_list" | wc -w)" -gt 1 ]; then array=() - for target in $target_device_list; do - target_size=$(lsblk --nodeps --noheadings -o SIZE /dev/"$target") - array+=("/dev/$target" "/dev/$target $target_size") + 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 ! TARGET_DEVICE=$(dialog --no-tags \ --menu "Select device to install image to" 10 60 3 \ 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 From patchwork Tue Jul 2 13:38:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3651 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-f184.google.com (mail-lj1-f184.google.com [209.85.208.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462DcjAT029478 (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-f184.google.com with SMTP id 38308e7fff4ca-2ec61a87db0sf42613061fa.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=Roee4XyEXy6aNmZ8Md5tmall/31jpQQGSR3YKo3cbYgsqUc9gqCz93tT306LYz0ECP +gxtFLDRz7GJkde/g4Q5/L9pMitPyRi6vcs3Hz54JbBURzCqEGrYNYUM5rjbZc+NhYNt NqR3bpsZnZsVT72NUNT43B+kXaK6LWLm9UVVtXNNvDtQ/cNYre1p6GB/72fdUK/w0Uzc VXLTxqINpSZTD/VsrpK4fQZnYKUYws6YxECzr163WrqrbmnbmLUoB/Lu4EdlRtcfIjpE 6wghElVEvRQrxjx3RwLhJECgofJDM5FU7c2K0/EyJXFFcPSdaXvq3MdQc2PsGyFJ3UCN ao5Q== 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=x50FzyuR+9B+nvsg6K/vrka+V1Q0zP/eUZFzM/GJcOM=; fh=ee5EbsUtAWENEE17OnSB7osCE3EvdtLv7dbYgLlJFqs=; b=A2SCxWNQpaNkf+g5C3UQo6UsJw0AFwKrolrRlD+8iIfvxWpn2tX9bu2UqrdqSJH+BU biwifZvX+QwkIEeiaqikfs/4fbTgfI44WlzibcQHsy0+mlpc1Bw32OrJLub5fGdcY4is Yq7jR9BWqsW6lVFuINzvw0w0swgxhZWHHGTyGPkb85Hc1nLfYMz5e2qOtA5f+jDfTx+i TkfNgHjPklmshGB6tNGyNL7WMLQd2ewXjJXpJvjpcdh/q3cE/pZ/6Fb5z2bLCTkZ0oz2 VZVaiUkKN8WcbQa0klvAlNOPbAkQ6bpet3lkvPdIcFy/6rOgx7vRDTAgXx/pY3BFKzSd M9Ew==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=v+K5pu9t; spf=pass (google.com: domain of fm-294854-202407021338343289d7899baf3a67a1-kjgjix@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202407021338343289d7899baf3a67a1-kjGjIX@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=x50FzyuR+9B+nvsg6K/vrka+V1Q0zP/eUZFzM/GJcOM=; b=tsvM2i1J/KarieU+CJmedKrR8wRxszOzf0G6uhvI9hflfoKFaTnBoufRQtxb2op47w eOrMlu57tn+Wbi8QLwD9HcokS9w2zE0ZMbh/a+mNZCnsDZMGaUANqiIj5Px0csdg2nno MTVbzHP67xAI9DHwh/UQdr1C27zctaboe/GPOV/ZpAH6oAqwlI+sJju+5AGRv1GS+lK0 zGmiUm1lkgfAyBTS/eaN3bwXP37kD8EWme5M0qeCXlONJeZP022BJqtZKTdCdikhMBpk kMsIGTCYofkXHxNfxRJ99JVkVLGUhS0ZnIE68F9smVRJl5/jCHZb7cweiWlfxWvDsN2s Z7DQ== 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=x50FzyuR+9B+nvsg6K/vrka+V1Q0zP/eUZFzM/GJcOM=; b=vkQG6JsVfOZXSvvR7HrsGS/irunEw/o01IxhgS6MpOlOL8t8mPI5c4Zt3D8xPQYKy1 NJJXk5L+UNSafIJvMBMCRrfCVeT78xZGazB8A5wPMOeiD5i9JUZHyD5qWmSTVsifQ0pr KZzu8oBuZq1qA3H4BRZa+l7cBca9mU4cOPvTjozyyesk3LRD4kSlJlmBcrKBFE0GFn4m TAylWiv1i9NxbwHK3kkmojm/03k0ddSM6xucq5OQKQsONQMWw3VA9zP9xu7yBSuEtZdh iw/GN8yS8tqRecyCyqhSMOEm6mYfIGb2+YK/eqKftIBTO8/VWrVtw1GB97hXqdCvjY+D DWFA== X-Forwarded-Encrypted: i=2; AJvYcCXkzY8SSkG7EDji7T+2fQfy6lwyuK9D9Z8osRk4wQUlhou+5wd7TtwwXic/cEgbMPtzegJ3rfQ52/+/hle01DDVRaScYW0= X-Gm-Message-State: AOJu0YzoNOXy5LRM6D5P6SC7PLrxoBZLUcy1PrESxzkPx3qVXiA8SKfc a+3BOXaSTN4M/CqkpLHgZSBp1z7M7THaK5IEvgVkjlOJcuxs7mbL X-Google-Smtp-Source: AGHT+IFIEyM9LdR8HbHKUD/1JhGWd6zIBETaZi+A608Ubti8qoUvIRK+1sbaUQB2t4OQlomDp81jgA== X-Received: by 2002:a05:6512:2247:b0:52c:e184:3dd6 with SMTP id 2adb3069b0e04-52e825ccc2fmr5460689e87.0.1719927516659; Tue, 02 Jul 2024 06:38:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3c99:b0:52c:da39:879e with SMTP id 2adb3069b0e04-52e7adaf4d2ls129850e87.0.-pod-prod-01-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:ac2:4c41:0:b0:52b:bee3:dcc6 with SMTP id 2adb3069b0e04-52e826fa995mr6602989e87.51.1719927514287; 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=jIWAas1y93w7EmCblKqXPruRaJERakV2QSgquPiqeOAKzZ7GZhYJ4h7ctw9qCDTKVi aRLXwksfTjExM416waSYPpjx/aASkY3xWG6q7HkYpasxtDQfFiSjzXsYfTWx302hx4YL diq9HCiK6rWdrdNFFx6/Q5XSb44+IrNQMK87VLqpL4VFLrcdHzsNyyjIH3RWd/drbqyM o7aHarSJlIkAbij6Z5DtBwz/9YLIASxEnuELMqaqSjarzFcZkZTjP6V6K/VtScIXC2nT 4FVqc9mleqwiM0WS1gxCLzepvyM7l6ZGT7JTaytR1w8V0ObMuDikSoA7Y5dz6DbZm63G QZ5A== 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=7syD+ob6eqBih7TwWwajkGrwVl9XVPOX8eD3BRpfz7c=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=xG4UmnlPwm/5VP6WvJd9IaokAvvZ5en9kxfo2zGXpP7hZ8PS6d6FohuBGBg0ByxiJv PMcgLqmnNQjGAutNo4c3nABpar4yO46T7DTUGs2jRLymKLmEQ9piT3cPJHfrrO+wob2i yofkxDPweuCWcXIUn1KLiUVPt6Hq/rpcR62BZsqOYkiKofxV++XdA3yIDnHAIQ6AAaaz tB/eDjfFqgpk6y+5kISqj8HlhJq6lss4a20P7ExKF8wqcl/yXoM+mFQyog3N1eDAV123 PrMu5ghUGn/+ynZD6ehTErlAY23PUy8RskyGgsdyAZohOPIb2YoKXpBhN7zgRH95jVTY P+GQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=v+K5pu9t; spf=pass (google.com: domain of fm-294854-202407021338343289d7899baf3a67a1-kjgjix@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202407021338343289d7899baf3a67a1-kjGjIX@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-425788015e4si5278465e9.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-202407021338343289d7899baf3a67a1-kjgjix@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202407021338343289d7899baf3a67a1 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 14/17] meta-isar: deploy-image: Re-indent Date: Tue, 2 Jul 2024 15:38:28 +0200 Message-ID: <3dcf8fd77a319d93427dd55842627d699a29eb04.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=v+K5pu9t; spf=pass (google.com: domain of fm-294854-202407021338343289d7899baf3a67a1-kjgjix@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202407021338343289d7899baf3a67a1-kjGjIX@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 No functional changes, just style improvements. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 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 5ae62a55..77eebe18 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 @@ -33,12 +33,12 @@ current_root_dev=$(readlink -f "$(findmnt / -o source -n)") current_root_dev=${current_root_dev#\/dev/} case $current_root_dev in mmcblk*) - ;; + ;; nvme*) - ;; + ;; *) current_root_dev=${current_root_dev%%[0-9]*} - ;; + ;; esac echo "Searching for target device..." From patchwork Tue Jul 2 13:38:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3648 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f60.google.com (mail-wr1-f60.google.com [209.85.221.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462DciPZ029461 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:44 +0200 Received: by mail-wr1-f60.google.com with SMTP id ffacd0b85a97d-366e9f5785fsf567792f8f.1 for ; Tue, 02 Jul 2024 06:38:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927517; cv=pass; d=google.com; s=arc-20160816; b=ZUw6BScaURRV8aIcMT1rNuwFJlxWb6wmDMGyWI6xRYJwUXQajzlJPsCI0RaJDYXxvL pg1c1Z2ruonTBjca9ke7T43pXCHHUlp73kOLvx5LzcGhUQmCg+EJX2FLicA8kr/NXqm3 ChBQTOzvJZrPZ+Z7siKQiB379TME84wMPl+nwo+lYzyv6Cg4QDCUdnhKzLrE6n1uZQSl 5rC9t4sMmsKKYzA/W3GzywkaGTnKQ1LSAZ1MA8s9sofxrUBtDz4O3WCAbFSwti2BTJaQ FMVyeHTdzuh2iWIjW0IiwOsfP1c9+uUKwEKBURtl8qyVLlAS3vtNNU2B9D2xJTd8IQkH CfCg== 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=Xk37ODrCIKSGtcgTbhh7LbG5Ml8I36tamMmg2H+5Jmw=; fh=yaRWvM1i4EM/9KtPT21lB3c2hqQVJkTVUJbsZ0Z91T0=; b=nkW/yhQhvGa0AyksG/ikRdhRplqiT7/ug7XA02VEHjkatBasEe/CmCxVlz7jmvGGk7 BVdFVqXZETSvQ2bwRwDmnAoGIB6AEfJSy0lewmUI+52bPdfcByUZPhH/6utv0eI/CsnX CvwGLNwQn1uI7EWikMAGQsUJG5kGXLg9OpOuRxUdpfCFHw1wPfILPCfrSlunYtcz3ZK8 qy3YxOxmuhQhnBNfqW5k+4dxEu0cFcICFRIkkfPTMDdntOBDWfAYA19zRBPNvqCgyiq7 9vTDGOr26j6tDHhAxvgVizhVXiJNYboVSLapCsPPeP3YkqzROr/etWRXkjjFhXga7oL5 5Unw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IS6pRBU0; spf=pass (google.com: domain of fm-294854-20240702133834f97ecd606dac0079ce-63e9a8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133834f97ecd606dac0079ce-63E9a8@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=Xk37ODrCIKSGtcgTbhh7LbG5Ml8I36tamMmg2H+5Jmw=; b=vloj3j3ClgDyn0kU0uu/cWh+lxHBG3UsQi7x6EUm1FikmHcBnw/CHv7rwfGatgN1MU cJ7fNZsOEQKXXg2nYFfhmjbruRl6sBx1AHQmDOWOs7PR+5PU6Et+dELDJQvQ7xP78Xf5 Ul7GEePnhb7Be8vdjMczJDnlOeQXW+EiyodmHSJEcQ7Dz7dhuPC/8wcxgkcG/gvSKUY4 gqhSD515ZbLyiN/fwW6YdrqTTI6tKuwQmshG36WOzblvzXtRXjVAM5QNGxVI7rm3f+d/ u8h/uyziyhDwvO++aDO3y7MYiEZXWTo2bP6kygjWTiC7/qRwp5AbpZZhZKszCD4RrexS lwSg== 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=Xk37ODrCIKSGtcgTbhh7LbG5Ml8I36tamMmg2H+5Jmw=; b=e2h0orWPY/8dUq+i5y8svyMCCbb0BHVWdwjWKCGCUb+hrCQJ3jAHPUcpv06UTzqIUc 1Lbp914NtrAoMDr9XP7ZfN8uaDLQIR6N3AR7YYQNEaxTFMQXu9Lem13ErUIcSs+TuHHi v3p8uzEDr5Guvfdj6twFhi6ulym7Bg9mZWt47E4trnskuy+KxB0BqcKukzAQuBtv7o3p uc6FDRJv0g0VmZB79X+5SWiO8GOn9q7nN8JmDW6KSm+m8Ft35fkVuJUzbmHfNw5XQFXj mlWrEzWqdiGbd+DHkeC0UCsGcYgLl3UK96I/oElsO8Rr1Eboe021TmH3Xd1HdUjBi119 XZlg== X-Forwarded-Encrypted: i=2; AJvYcCU2Ufguf2WWsXThy3zZjYCKLEwMPHJJqRnmAXsDxeebzTwwMYFdkHBjEN0Xas4Qldo5toOUh+KggvQlr9q+f+4D7Q8xZns= X-Gm-Message-State: AOJu0Yxi15bTeJCe2m/EEDH7y1kDu1Aw29JzMgM6K7FuxdO13rdw7MW9 EsbD65lJ4QT3K3jag4ARVz7WTpOZ1ojn1t6kzwFDl++kBlR9XSxw X-Google-Smtp-Source: AGHT+IHwuxK/cY+Jyqap5S4YphNvXKV0TxMZnoEvSpo7sonhn4e8qneK1IvYLjV8ZQ3Kp6KutDZYGg== X-Received: by 2002:a05:600c:511c:b0:425:52c9:3fae with SMTP id 5b1f17b1804b1-4257a015366mr61494445e9.1.1719927516628; Tue, 02 Jul 2024 06:38:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c96:b0:423:7d5:b53c with SMTP id 5b1f17b1804b1-4256bb0b1f6ls18818035e9.0.-pod-prod-06-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:a05:600c:314b:b0:424:a5df:b998 with SMTP id 5b1f17b1804b1-4257a00cfd8mr56777405e9.9.1719927514457; 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=dTpzTpfFI9WC8naF62TArfHHT2MS4gh66JzV/k3A6vrw0hC/G+0YbpP6gHH9mxU/v+ i5Ff1IiT1NB+fRjuKCVjyS7Lck7W8wXzHQsgACxqkCQ0PIPhxmORFBPkx5hDqLSa3Cj1 eE9noACBBU9hbsnRJVLulfD/u1WuT0MEMBaaJ7wgaePEFhhZK0QzkJ37kqtF/TgGN9+S mulSDjIS0lkYQu0GP3vtzF9YvByDaQ5wO+G7Zm8Sp62ZcWVZVMyYmDH9BxucJo4aIoFH 38bHrsCO5LEcoquJuRjnlsnWbfSGHMHWdecQyuzJE043Bj1xyKRg7pbXw7WElGq/Cd/7 BCWw== 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=TCuFpVh2p5rZ/gBB0e7WFXxi71qsiJbJmvANUt82SOg=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=sVOxYAwM+6VnhcXY6uRKamxfFBY9BcPpxMfJVhvfSyomE0hJ7a6X8mKiIAJ/jx0g6X q+uCV5ohCkHRQNTs4GscRSFbhBmI4jFllQjliAW0sTvKNtXyHZgOZIiQeJ+ROAW3whpm Tt06cMBONA8X5bwVIiwnw46wqMWt1z7qnhVsS5WHC7WR0RF8se1n8FsqeMxeBmNUCG8S gq0adZpC0PYFjdFaK9HPBaKFMFh0XFSJ1WC2Phzx/nH+Pl3ZcA3eBPDnQdRw50ioPlrk YMTS8rlMMwy3i7oST1aQKgTWs5YzKcCqOM9QyQlm7LRY8x5dd/Sk5Tx4gQdy9NWxttMc kdnQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IS6pRBU0; spf=pass (google.com: domain of fm-294854-20240702133834f97ecd606dac0079ce-63e9a8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133834f97ecd606dac0079ce-63E9a8@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42577a0deb0si4303495e9.0.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-20240702133834f97ecd606dac0079ce-63e9a8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240702133834f97ecd606dac0079ce 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 15/17] meta-isar: deploy-image: Prepare for auto-installation mode Date: Tue, 2 Jul 2024 15:38:29 +0200 Message-ID: <9545129ff28fb28b7142a31090f023c4420a5f4a.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=IS6pRBU0; spf=pass (google.com: domain of fm-294854-20240702133834f97ecd606dac0079ce-63e9a8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133834f97ecd606dac0079ce-63E9a8@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 Wrap the code blocks that will be skipped in auto-installation mode separately to ease review. As the controlling variable remains false for now, there are effectively no functional changes. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 163 +++++++++--------- 1 file changed, 86 insertions(+), 77 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 77eebe18..9df93fe7 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 @@ -6,21 +6,26 @@ installdata=${INSTALL_DATA:-/install} -DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) -if [ -z "$DISK_IMAGE" ] || [ ! -f "$installdata/$DISK_IMAGE" ]; then - pushd "$installdata" - for f in $(find . -type f); do - array+=("$f" "$f") - done - popd - if [ ${#array[@]} -gt 0 ]; then - if ! DISK_IMAGE=$(dialog --no-tags \ - --menu "Select image to be installed" 10 60 3 \ - "${array[@]}" --output-fd 1); then - exit 0 +AUTO_INSTALL=false + +if ! $AUTO_INSTALL; then + DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) + if [ -z "$DISK_IMAGE" ] || [ ! -f "$installdata/$DISK_IMAGE" ]; then + pushd "$installdata" + for f in $(find . -type f); do + array+=("$f" "$f") + done + popd + if [ ${#array[@]} -gt 0 ]; then + if ! DISK_IMAGE=$(dialog --no-tags \ + --menu "Select image to be installed" 10 60 3 \ + "${array[@]}" --output-fd 1); then + exit 0 + fi fi fi fi + if [ ! -f "$installdata/$DISK_IMAGE" ]; then dialog --msgbox "Could not find an image to install. Installation aborted." 6 60 exit 1 @@ -28,79 +33,81 @@ fi DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") # inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh -target_device_list="" -current_root_dev=$(readlink -f "$(findmnt / -o source -n)") -current_root_dev=${current_root_dev#\/dev/} -case $current_root_dev in - mmcblk*) - ;; - nvme*) - ;; - *) - current_root_dev=${current_root_dev%%[0-9]*} - ;; -esac - -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 - case $device in - loop*) - # skip loop device - ;; - mtd*) +if ! $AUTO_INSTALL; then + target_device_list="" + current_root_dev=$(readlink -f "$(findmnt / -o source -n)") + current_root_dev=${current_root_dev#\/dev/} + case $current_root_dev in + mmcblk*) ;; - sr*) - # skip CDROM device - ;; - ram*) - # skip ram device + nvme*) ;; *) - case $device in - $current_root_dev*) - # skip the device we are running from - ;; - *) - target_device_list="$target_device_list $device" - ;; - esac + current_root_dev=${current_root_dev%%[0-9]*} ;; 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 + echo "Searching for target device..." -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)") + 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 + case $device in + loop*) + # skip loop device + ;; + mtd*) + ;; + sr*) + # skip CDROM device + ;; + ram*) + # skip ram device + ;; + *) + case $device in + $current_root_dev*) + # skip the device we are running from + ;; + *) + target_device_list="$target_device_list $device" + ;; + esac + ;; + esac done - if ! TARGET_DEVICE=$(dialog --no-tags \ - --menu "Select device to install image to" 10 60 3 \ - "${array[@]}" --output-fd 1); then + + 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 ! 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" | tr -d " ") + if ! dialog --yes-label Ok --no-label Cancel \ + --yesno "Start installing\n'$DISK_IMAGE'\nto $TARGET_DEVICE (capacity: $TARGET_DEVICE_SIZE)" 7 60; 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" | tr -d " ") -if ! dialog --yes-label Ok --no-label Cancel \ - --yesno "Start installing\n'$DISK_IMAGE'\nto $TARGET_DEVICE (capacity: $TARGET_DEVICE_SIZE)" 7 60; then - exit 0 fi if ! cmp /dev/zero "$TARGET_DEVICE" -n 1M && \ @@ -118,6 +125,8 @@ 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." 6 60 +if ! $AUTO_INSTALL; then + dialog --title "Reboot" \ + --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 6 60 +fi exit 0 From patchwork Tue Jul 2 13:38:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3649 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:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f63.google.com (mail-wr1-f63.google.com [209.85.221.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcijs029464 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:44 +0200 Received: by mail-wr1-f63.google.com with SMTP id ffacd0b85a97d-3678fcc4d7fsf4881f8f.0 for ; Tue, 02 Jul 2024 06:38:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927516; cv=pass; d=google.com; s=arc-20160816; b=MMpyV3/nIC61Q5TeZNpXvA6gxkLxrQGbdTIQmz82lPd14T6fA+SSy0/DkBGo6M/dQw udKgLIt6uBQ+JgfEYTq8NqAXulwEtywlLDpd8tYGfc4ElDaNkm+xdqoeXHLldsiP4k3F 2NksHBAglfVjaPVUH6THV41K3mrqtxqlCTBeB2pQ4fQ0/0dg8euKXNSzFe2lM3lFKenP 4N6ugiPgK1OdMaR3hMNkhtyHqHBMXgfXjkIjc65MiqTQtWwxUobiKjIAbWkIKFz3kX87 NAJjUGW5ypzDeEZpxpi1DYtlR3CSUvpa7R1tHwmlzOKEpqfw7YPOOqJbBQp+u7I7P6GB rMvg== 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=RDuOejZ/wja4Z74E9ACsmKDewPwpRV9sU/X8jAOx9tI=; fh=KJSYnoO5ctQyALBQXxPkDEKMr5sP4oA5+7i8m/T8rs0=; b=K5xgF/cm3ubHBH9itoAJxRQ/FEGnD4HXull0fZJsIAG2HItzm47ObdBmvzEtUCxe38 76z7aoDi3oZRIFyLDAWIktT5Wbw1lwEj9m83cW67bk8oL6KP1VFLXedfMd8jzfQY9Mf9 r4OkJI5z7/ZbBb+CcrYOb2ErXUm9wi7oWMMNQrqNCcd7iMTAtvgixaDal30MYerCLc4l er0ttuEKU3wUsYQ1gBvBB6DAgMsTS77BYuadBn01Cip7/tUaMrkv7VnR0nQF1LT9sRzG XwWaAZM4U6f+OMJC5W5kIM4WTOi3+09/EVdh8OtltIw/hlMPJTjcJOhprKEUNgb5FE+N CuCQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=eD3rEFYM; spf=pass (google.com: domain of fm-294854-20240702133834a4b34f59eb90b1a8c3-jaxsdj@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133834a4b34f59eb90b1a8c3-jaxSdj@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=RDuOejZ/wja4Z74E9ACsmKDewPwpRV9sU/X8jAOx9tI=; b=xN4Ph6Y8iz4cAPWrmxKv75/1EmpseueGyOfQM5x44S2apXmSHmSf+qrO3E23kIE0+n 4i9YqxDL+GTdXerSngzMmkdJolLadpqvZr3aJirLp3tW6XCBlxKVICrS+Ttqrhpqz8kO 6ctamGWzE9Qf+C3uafUBpkXKrdlTP3TOemCebf3T3SXI/rhXyFOiCiiselWbvHSTXoen rB13stFps80jy1N/dUg5rg3cLQOEP0JOAT7uyQ7xRPDFluKITMrnaDPtdNH0ci7Ma4X9 yF6KvA99QWialsy9/W6NHlgsqu+d+CmtIER5L9Ckv1k3weUguxbxoTEhvBVDiEJUp3/2 kGPQ== 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=RDuOejZ/wja4Z74E9ACsmKDewPwpRV9sU/X8jAOx9tI=; b=GlORmpwwTAEPvtYvHyppJnQ2Djq+qRGL0jFpOLTP1/UVDCA+Ep/BDneKXqqa2DXgmM VJagj5ScmXkQgs/QE2Ej/Qil+YYe5YojB/8gr6cxiHCCCTMc8C6BXmU7qOVSZMds//SK LRS9oNUduq5vHjpHMw8HTCfRJB9OeEbW4wDq0UeDCu3DugUOUQB2elbqH/wbnDWjgMWj fpnnm7fSVfX3dQfrDjZWauyiL8h6k9+kBlbDz8CPx8J/cvmvedznifDm3L+owbc5ZubC a8+e5a79q1wCS23kVbWzWCs0jlCKko9YuMfJ/KwIc0m/R5iWtqFvsvxA3rYgjxgpoCXy KmYA== X-Forwarded-Encrypted: i=2; AJvYcCW3+TU9CDyLnQLyum532+KXWWCICtREECeeenk3pA1OXLhkArsXL0AGvChsOrj6RuewXnOpQyji/9YcnZcLaogUA8a/Xoc= X-Gm-Message-State: AOJu0YyTyoI4JNbVV3ZMt3nweKD4RAX6PseAeo3zBFEkMq0VIYoJBthv WpH5jLzRdTqaZ6QYl7dEdWM7b2KCCEopQQ42AiCWtnguzGs8N4d2 X-Google-Smtp-Source: AGHT+IHej6OFtbdhm9JlO/3TP96IAQeHO07dZCOxv/5obs2PcwydAtu4IeW+YGCPT3ELh64Hf1rGEg== X-Received: by 2002:a05:600c:511c:b0:425:52c9:3fae with SMTP id 5b1f17b1804b1-4257a015366mr61494295e9.1.1719927516340; Tue, 02 Jul 2024 06:38:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4fd4:b0:421:e8fc:1263 with SMTP id 5b1f17b1804b1-4256bbe507els19002375e9.1.-pod-prod-03-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Received: by 2002:a05:600c:2d42:b0:424:a5b4:6dd3 with SMTP id 5b1f17b1804b1-4257a0763fbmr65192415e9.36.1719927514496; 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=uTil++G+jP7Oqq4Lh0r/mRfg5NiVKy8ngABMw/p92zuWeB5dq0KF5TjF4AddT6CBAr 9gzlt+uQZD8OiHIQJWVwfqpXDe6HPrPX8xH6iTfO2OYbTxrMHHqtNO71NuaXhCP7rhqW YeEPh7zJi7GZoJyDkQTgSOU6gVM0dfoYSe8tikvkGD6SgnEe37faElIq1rGw/ERNnu1u sK97L+nP9iJT/LIUB4UhObBeB2bSI7nfhkX/Njzo+g5HOraj4hOBBM09WJbqS+NwAtgM rSuiJ+47CX0wjZPziEYHETD+ym3pfcx2Fg8TuuroMaFtFF6xqNVGuzL7ilMnVigU+iEh h3dg== 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=PVyg7IZZg1Rz4E7JQsqFZ4ajhB6nqcZs7LltWveFMeQ=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=tdf4dzInSfzZ62ZritoL8wwOaB0g/ys9V+827TnHALussyJZtWyQBbuhGfPpMTXzPm X0TBpRuNMr3aT31DBQUD9hzGe9dlNNZBobKu8bsLSTSsqiyc7ND6J/jUYKFIDVP4SMwC 5r+qyzKKS2Q0gUwlcUGTBHziCEquomn/j69ZwUwMJZZDXqBIrCmYD65kro1vgz/8rjlF NxC4LW0XtB0n6TG+SN8jaTNkKzU3EQONXMYI9IHre93zjFd//EkeNoPmUMWKI/wD10Rc ETr+HaobWcIQm3F/paeWL5SAYRMfclacn74XdWYO+StQMgjmj5hSRTHzY//Gz3+uzNC1 GUiQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=eD3rEFYM; spf=pass (google.com: domain of fm-294854-20240702133834a4b34f59eb90b1a8c3-jaxsdj@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133834a4b34f59eb90b1a8c3-jaxSdj@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-20240702133834a4b34f59eb90b1a8c3-jaxsdj@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 20240702133834a4b34f59eb90b1a8c3 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 16/17] meta-isar: deploy-image: Introduce auto-installation mode Date: Tue, 2 Jul 2024 15:38:30 +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=eD3rEFYM; spf=pass (google.com: domain of fm-294854-20240702133834a4b34f59eb90b1a8c3-jaxsdj@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133834a4b34f59eb90b1a8c3-jaxSdj@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 If a special file called auto.install is found in the installation data directory, parse this and attempt an unattended installation. The file consists of 2 to 3 lines: - source file name - target device path - optionally, "OVERWRITE" to ignore if the target device is non-empty e.g.: $ cat /install/auto.install isar-image-base-debian-bookworm-qemuamd64.wic.zst /dev/vda OVERWRITE Errors are still stopping the process, switching it back to interactive mode. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 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 9df93fe7..8b25b1d2 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 @@ -7,8 +7,20 @@ installdata=${INSTALL_DATA:-/install} AUTO_INSTALL=false +OVERWRITE= -if ! $AUTO_INSTALL; then +if [ -f "$installdata/auto.install" ]; then + exec 3<"$installdata/auto.install" + read -r DISK_IMAGE <&3 + read -r TARGET_DEVICE <&3 + read -r OVERWRITE <&3 + exec 3>&- + if [ ! -b ${TARGET_DEVICE} ]; then + dialog --msgbox "Target device is not a valid block device. Installation aborted." 6 60 + exit 1 + fi + AUTO_INSTALL=true +else DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) if [ -z "$DISK_IMAGE" ] || [ ! -f "$installdata/$DISK_IMAGE" ]; then pushd "$installdata" @@ -110,7 +122,7 @@ if ! $AUTO_INSTALL; then fi fi -if ! cmp /dev/zero "$TARGET_DEVICE" -n 1M && \ +if [ "$OVERWRITE" != "OVERWRITE" ] && ! cmp /dev/zero "$TARGET_DEVICE" -n 1M && \ ! dialog --defaultno \ --yesno "WARNING: Target device is not empty! Continue anyway?" 5 60; then exit 0 From patchwork Tue Jul 2 13:38:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3654 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:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f60.google.com (mail-lf1-f60.google.com [209.85.167.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcl18029687 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:47 +0200 Received: by mail-lf1-f60.google.com with SMTP id 2adb3069b0e04-52ce04ea31csf4660446e87.0 for ; Tue, 02 Jul 2024 06:38:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927517; cv=pass; d=google.com; s=arc-20160816; b=GPUmE09epuNPrlCnxWyK1bBbF5wqpM7telTCpyTJf+dgHMMvLwdm+uW7tTibyoExVc VT1QKIPkArBClE8Zqgs15PeEe8T6D1mPi+dg9TEDCJ0N5KdQSZUwptb73D5TBUq+Ln3r i6kUWIMhc6uBYCgo1ngTaYU57Cu9Wg59QVCyd65al0jBsP1cV1TMcRm54kuPBjJiwPvh aShMhs1rsaDHhQED3mrDCsVpHmJPOT7cDergswJTF8YEw2sZ2ZcZ+wDmueTzGvN6yjFE TscrvyQXUKYo9X+ZO/cW1AzxDPz6i/6RaXDzAaMt4yEgKw3GW2BGyN8GznF1UFYA9dha zYrg== 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=IdfTb8BIIHeOXTj0s9aC24FIFq8H1DXE97fmTGj2wNI=; fh=MD8EqNqL/NQ00qdH8gAFU7Wyj6+ZK9ZMmD4GIHw7QP4=; b=r2uV5wvOtAenfkJDKiX13pZReSXre5cWDO7k6XkvTKKYx87fUGkjo1w1+xY5aV2aVI B7ml/HUx3cnzHVS/PiK9UR2GxApq8/WlmBWC0qzYBl35wPWCncYZW+haAO/kGNQR3CzM vEHePkyy32pipA7MCZUVgtDMMgyKjzTVnhiO0NQ+ocztFCpU8qwrpTFd25xO/uT2rW7T al5NP7huiCrh9a2K7+w0k8HgSh6O8AkTRPyflODhaGEqp4vX3474Rwj9LI3cdrHoDl7Y 1BvF72sXuqiSE/XEw1odteeE4oyWjKrJR+WV9eca33UDOEsBdCAMYdJoAjVzq6qqB76G eCUw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=RdpKTEOp; spf=pass (google.com: domain of fm-294854-202407021338346ad9cc9ed5eb32bb1f-lxz_us@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338346ad9cc9ed5eb32bb1f-lxZ_Us@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=IdfTb8BIIHeOXTj0s9aC24FIFq8H1DXE97fmTGj2wNI=; b=BuckLbT/9AUD6q6g73DyO0YV7hPfuyTKtwwrvJ77o5I0c3EoLJj4pv0DHtYRSI5fTB 9ihS+9U6Wq5kbHjuK0rdZVTxQKuu4PdUveE5BRsPiSJ4X4BZx9SjlLeLvRR9v98RyQUZ bL6zEtGY+5pm+inREed4gcoL0HSXOt/FCrCIfR/cepFphQ8RIrXq5n3cRG4zcnmLyOSf Ik841FO6bcT21bJuHukgR1YLbfv69n1e96RLY5kcsYZaPTDZgnNvPSlA8OUT46NzhPyI p8EFkbjZ02ekY/90HaqvFmxCqOODHPwihll5Fn2ZAavabXGDsPzz9nKaX2hQAH5qafGu xn2w== 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=IdfTb8BIIHeOXTj0s9aC24FIFq8H1DXE97fmTGj2wNI=; b=dB6pquw+lcIWVXuQgHLajTCcsUQg/MpTzHvSq7JM9eTxrxdBm8y5AkBGaUvBuaHgOY eIdO3lND5c4WIhJwfYkTTyLKdInjTpsDWS3uO2IOa04TmpHByN2M1ruH/ZnV6iANaoTa 3ba6+nP9F43VDglOuoqolBwu61OFbCPmM3YPvnMIAndQWWsO4P0636ILlaKV/GLZMAy0 R3TmWw6xhzzmLMXqEoA5/LXD4o6CaYEHZzwt03ncEBN4ecQeLm1WSFiIvje6iZcwyb5B VMgqwDu47DkQ6TWJ0e7rPfa98r/9KqVAEG4XtYFU2EWl7WV8KvjQRe5eAuAL9uG2iSyC 5m1A== X-Forwarded-Encrypted: i=2; AJvYcCV1RVVVU0zcu8qfr9b4JMp9mxR4eFbTogNhUjGDgHo5AUGuOpHsfnU8S8i9W+GDPaz38k5O4H31lin+IMhbgXj8dOOPGtQ= X-Gm-Message-State: AOJu0YxAdzTRdG9590fhIAa1wVMo3u5fZfQwvXnMu2W6Kkdu+nNQxha6 l/VtuPwgnRmKjeQD1EFp4GJSkcR/cEjK0f/FuPeMYmh47tlYv+88 X-Google-Smtp-Source: AGHT+IGsG0inMFXAWPDTuFdm4cPDlmTIbRTqS/BaDupl82j36AU+cqdBLCslPio87gr+QbMBAXSPEw== X-Received: by 2002:a05:6512:e93:b0:52e:7f3c:6b81 with SMTP id 2adb3069b0e04-52e82687479mr6790309e87.32.1719927516994; Tue, 02 Jul 2024 06:38:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4751:b0:425:860c:df48 with SMTP id 5b1f17b1804b1-425860ce011ls8072215e9.0.-pod-prod-01-eu; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-Received: by 2002:a05:600c:2481:b0:425:5f25:c926 with SMTP id 5b1f17b1804b1-4257a0115d6mr58814525e9.19.1719927514955; 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=V6N3F25gfaeAPR/YeOtJHcT0kEl5z6zaduJCrtTtAD3xLCwpk1NwMPoozHudNekUKv keGz57iUqqon1O35/R0VD1YmKo8ZlyQgZMzV3yyVx0h9ZC57jvbEzVtanp+HhLODeVP/ PuuyX+eA5Qk5nPPQao/Uj5c4YUnrPgOt7rrjbyhmClrOr9GyEUUMkrJIpBJXrQc3n/Ew j/k/p/+CcQZEUh+6tynGB0jQuR+AlG4BrPwdrQP3L7TTH8svyqY0S6DH+6Dt8VifYVYb SVGbghPh9p/NeDaTuxmNtmqtsUTAu+Wi/uHiTJgrPIZGel9gW4MTQmnys6YEGdbL9Qa/ 044Q== 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=NrjAl6jD0W3UnMX006fFzKDgmj35Xq0ndsoXc3fB9hs=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=oOayVzfLdM2DkHHNBiUcTsVepvT36g+gtmYbhBOnaEuB+V32clI4LUDJkzZcGyDB3Z xOU2p2xcw9i5B2qyNggnaOH9NqNAR7JNangnEEWLOe9B+YKXdgiOYvHT7kp92HJDb1hk StD364wW4l2v5T1jxbE0tleiENwr+YmpmwxEj0wcy/SxQd+bardxGb1o76wY0suTwQZ4 miquNYoaTtk0f4VOTu+a3QJpbtQgZowhGmnPLwVKKPC4kiPazD6cdumXjxRnIF4FgFUw PQ+dekNpY3ypWlNeuZ/FZy9ZmA3TfAXUW9+9GXtkwM/+mcESRQzZM5A7YDii7VtB66/C btiQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=RdpKTEOp; spf=pass (google.com: domain of fm-294854-202407021338346ad9cc9ed5eb32bb1f-lxz_us@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338346ad9cc9ed5eb32bb1f-lxZ_Us@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42577a0deb0si4303495e9.0.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-202407021338346ad9cc9ed5eb32bb1f-lxz_us@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202407021338346ad9cc9ed5eb32bb1f 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 17/17] meta-isar: deploy-image: Polish recipe Date: Tue, 2 Jul 2024 15:38:31 +0200 Message-ID: <6279c4d497ade9a55cad9c0f2f21834ae97f964c.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=RdpKTEOp; spf=pass (google.com: domain of fm-294854-202407021338346ad9cc9ed5eb32bb1f-lxz_us@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338346ad9cc9ed5eb32bb1f-lxZ_Us@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 Adjust description to what the tool actually does. Reindent. Signed-off-by: Jan Kiszka --- .../recipes-installer/deploy-image/deploy-image_0.1.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 0e61de03..3f34424f 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 @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: MIT -DESCRIPTION = "add target image to rootfs" - +DESCRIPTION = "Install image to device" inherit dpkg-raw @@ -16,7 +15,7 @@ do_install[cleandirs] = "${D}/usr/bin/ \ ${D}/usr/lib/systemd/system/getty@tty1.service.d/ \ ${D}/usr/lib/systemd/system/serial-getty@ttyS0.service.d/" do_install() { - install -m 0755 ${WORKDIR}/deploy-image-wic.sh ${D}/usr/bin/deploy-image-wic.sh - install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/getty@tty1.service.d/override.conf - install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/serial-getty@ttyS0.service.d/override.conf + install -m 0755 ${WORKDIR}/deploy-image-wic.sh ${D}/usr/bin/deploy-image-wic.sh + install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/getty@tty1.service.d/override.conf + install -m 0600 ${WORKDIR}/install.override.conf ${D}/usr/lib/systemd/system/serial-getty@ttyS0.service.d/override.conf }