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