From 216865da8d96cab8e9356d08ffb9317adb63c3e7 Mon Sep 17 00:00:00 2001 From: Weisson Date: Tue, 6 Dec 2022 16:56:03 +0800 Subject: [PATCH] Mark reboot behavior for SMC interface. Signed-off-by: Weisson --- ...rk-reboot-behavior-for-SMC-interface.patch | 25 +++++++++++++++++++ leapp.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0006-Mark-reboot-behavior-for-SMC-interface.patch diff --git a/0006-Mark-reboot-behavior-for-SMC-interface.patch b/0006-Mark-reboot-behavior-for-SMC-interface.patch new file mode 100644 index 0000000..df1cafb --- /dev/null +++ b/0006-Mark-reboot-behavior-for-SMC-interface.patch @@ -0,0 +1,25 @@ +From 4abf8d0b87175e861966f22601db29cd743d8862 Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Tue, 6 Dec 2022 16:50:03 +0800 +Subject: [PATCH] Mark reboot behavior for SMC interface. + +Signed-off-by: Weisson +--- + leapp/workflows/__init__.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/leapp/workflows/__init__.py b/leapp/workflows/__init__.py +index 6463160..5b218b2 100644 +--- a/leapp/workflows/__init__.py ++++ b/leapp/workflows/__init__.py +@@ -385,6 +385,7 @@ class Workflow(with_metaclass(WorkflowMeta)): + reboot = True + if phase[0].flags.request_restart_after_phase and not self._auto_reboot: + reboot = False ++ smc_interface.update_progress_infomation(progress_info="ReadyToReboot", path=smc_state_file_path) + messaging.request_answers( + RawMessageDialog(message='A reboot is required to continue. Please reboot your system.') + ) +-- +2.30.1 (Apple Git-130) + diff --git a/leapp.spec b/leapp.spec index 5a2c2aa..fb3bee6 100644 --- a/leapp.spec +++ b/leapp.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.4 +%define anolis_release .0.5 # IMPORTANT: this is for the leapp-framework capability (it's not the real # version of the leapp). The capability reflects changes in api and whatever # functionality important from the point of repository. In case of @@ -41,6 +41,7 @@ Patch0002: leapp-0002-add-command-no-rhsm_skip.patch Patch0003: leapp-0003-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch Patch0004: leapp-0004-report-a-default-external-link.patch Patch0005: 0005-SMC-progress-indicator.patch +Patch0006: 0006-Mark-reboot-behavior-for-SMC-interface.patch %if !0%{?fedora} %if %{with python3} @@ -163,6 +164,7 @@ Python 3 leapp framework libraries. %patch0002 -p1 %patch0003 -p1 %patch0005 -p1 +%patch0006 -p1 ################################################## # Build @@ -283,6 +285,9 @@ rm -f %{buildroot}/%{_bindir}/leapp # no files here %changelog +* Tue Dec 6 2022 Weisson - 0.12.0-1.0.5 +- Mark reboot behavior for SMC interface. + * Mon Nov 28 2022 Weisson - 0.12.0-1.0.4 - SMC progress indicator -- Gitee