[03/17] meta-isar: deploy-image: Change reboot logic

Message ID	6e97e882f080e09a9f7d777cc84e9cd089d92d11.1719927511.git.jan.kiszka@siemens.com
State	Accepted, archived
Headers	show Return-Path: <isar-users+bncBCJI7SMNV4NBBWUFSC2AMGQET4FHRTQ@googlegroups.com> 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; From: "'Jan Kiszka' via isar-users" <isar-users@googlegroups.com> To: isar-users <isar-users@googlegroups.com> Cc: Quirin Gylstorff <quirin.gylstorff@siemens.com> 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: <cover.1719927511.git.jan.kiszka@siemens.com> References: <cover.1719927511.git.jan.kiszka@siemens.com> MIME-Version: 1.0 Feedback-ID: 519:519-294854:519-21489:flowmailer Reply-To: Jan Kiszka <jan.kiszka@siemens.com> Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com
Series	Reworks, fixes and unattended mode for image installer \| expand [00/17] Reworks, fixes and unattended mode for image installer [01/17] Kconfig: Rework installer image submenu [02/17] installer: Do not show systemd boot menu [03/17] meta-isar: deploy-image: Change reboot logic [04/17] meta-isar: deploy-image: Drop umount attempt after installation [05/17] meta-isar: deploy-image: Fix bmap support [06/17] meta-isar: deploy-image: Improve root mountpoint discovery [07/17] meta-isar: deploy-image: Make TARGET_DEVICE a complete path [08/17] meta-isar: deploy-image: Drop pointless --clear options from dialog [09/17] meta-isar: deploy-image: Allow to cancel installation [10/17] meta-isar: deploy-image: Warn if overwriting a non-empty disk [11/17] meta-isar: deploy-image: Fix and enhance image selection dialog [12/17] meta-isar: deploy-image: Improve target device list dialog [13/17] meta-isar: deploy-image: Polish some dialogs [14/17] meta-isar: deploy-image: Re-indent [15/17] meta-isar: deploy-image: Prepare for auto-installation mode [16/17] meta-isar: deploy-image: Introduce auto-installation mode [17/17] meta-isar: deploy-image: Polish recipe

Message ID

6e97e882f080e09a9f7d777cc84e9cd089d92d11.1719927511.git.jan.kiszka@siemens.com

State

Accepted, archived

Headers

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;
From: "'Jan Kiszka' via isar-users" <isar-users@googlegroups.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Quirin Gylstorff <quirin.gylstorff@siemens.com>
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: <cover.1719927511.git.jan.kiszka@siemens.com>
References: <cover.1719927511.git.jan.kiszka@siemens.com>
MIME-Version: 1.0
Feedback-ID: 519:519-294854:519-21489:flowmailer
Reply-To: Jan Kiszka <jan.kiszka@siemens.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list isar-users@googlegroups.com;
 contact isar-users+owners@googlegroups.com

Series

Reworks, fixes and unattended mode for image installer | expand

Commit Message

Jan Kiszka July 2, 2024, 1:38 p.m. UTC

From: Jan Kiszka <jan.kiszka@siemens.com>

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 <jan.kiszka@siemens.com>
---
 .../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

[03/17] meta-isar: deploy-image: Change reboot logic

Commit Message

Patch