From c025a66356c22feace5d5315196ed6ec82ca7865 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 1 Feb 2021 13:17:54 +0100 Subject: [PATCH 1/7] Logging all available product information into directory /var/log/YaST2/product_info before starting the installation. --- package/yast2-installation.changes | 1 + src/lib/installation/clients/inst_doit.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 0f36b0b2d..05a11aa39 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,4 @@ + ------------------------------------------------------------------- Thu Apr 29 15:59:52 UTC 2021 - Martin Vidner diff --git a/src/lib/installation/clients/inst_doit.rb b/src/lib/installation/clients/inst_doit.rb index d892bb603..dff2950c0 100644 --- a/src/lib/installation/clients/inst_doit.rb +++ b/src/lib/installation/clients/inst_doit.rb @@ -30,6 +30,7 @@ def main Yast.import "Mode" Yast.import "AutoinstConfig" Yast.import "PackagesUI" + Yast.import "ProductEvaluation" Yast.import "Label" @@ -64,6 +65,10 @@ def main false, false ) + + # Logging all information about the product evaluation + ProductEvaluation.write( + Mode.update ? "update_start" : "installation_start") end @confirmed ? :next : :back From 61b4632665d56c60401e0f50dc8cd7da22f1b584 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 1 Feb 2021 13:19:01 +0100 Subject: [PATCH 2/7] rubocop --- src/lib/installation/clients/inst_doit.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/installation/clients/inst_doit.rb b/src/lib/installation/clients/inst_doit.rb index dff2950c0..7177ed042 100644 --- a/src/lib/installation/clients/inst_doit.rb +++ b/src/lib/installation/clients/inst_doit.rb @@ -68,7 +68,8 @@ def main # Logging all information about the product evaluation ProductEvaluation.write( - Mode.update ? "update_start" : "installation_start") + Mode.update ? "update_start" : "installation_start" + ) end @confirmed ? :next : :back From a42ed1b837f9793402f9fd6492fe5c9608ece9af Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 11 Feb 2021 20:15:54 +0100 Subject: [PATCH 3/7] adapted suggestions --- package/yast2-installation.changes | 1 - src/lib/installation/clients/inst_doit.rb | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 05a11aa39..0f36b0b2d 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,4 +1,3 @@ - ------------------------------------------------------------------- Thu Apr 29 15:59:52 UTC 2021 - Martin Vidner diff --git a/src/lib/installation/clients/inst_doit.rb b/src/lib/installation/clients/inst_doit.rb index 7177ed042..704f6e5d3 100644 --- a/src/lib/installation/clients/inst_doit.rb +++ b/src/lib/installation/clients/inst_doit.rb @@ -19,6 +19,8 @@ # current contact information at www.novell.com. # ------------------------------------------------------------------------------ +require "installation/installation_info" + module Yast # Asks user to really do the installation/update. class InstDoitClient < Client @@ -30,7 +32,6 @@ def main Yast.import "Mode" Yast.import "AutoinstConfig" Yast.import "PackagesUI" - Yast.import "ProductEvaluation" Yast.import "Label" @@ -66,8 +67,8 @@ def main false ) - # Logging all information about the product evaluation - ProductEvaluation.write( + # Log all information about the installation/update + ::Installation::InstallationInfo.instance.write( Mode.update ? "update_start" : "installation_start" ) end From e3fa59e372549c14da5d572c7690897e8e07e1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 14 May 2021 10:53:02 +0200 Subject: [PATCH 4/7] Update --- src/lib/installation/clients/inst_doit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/installation/clients/inst_doit.rb b/src/lib/installation/clients/inst_doit.rb index 704f6e5d3..c9f6df9b5 100644 --- a/src/lib/installation/clients/inst_doit.rb +++ b/src/lib/installation/clients/inst_doit.rb @@ -69,7 +69,7 @@ def main # Log all information about the installation/update ::Installation::InstallationInfo.instance.write( - Mode.update ? "update_start" : "installation_start" + Mode.update ? "Stating update" : "Starting installation" ) end From 420fd8267f606834afb161dfec450360a5a3b15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Mon, 17 May 2021 17:11:26 +0200 Subject: [PATCH 5/7] Fixed typo --- src/lib/installation/clients/inst_doit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/installation/clients/inst_doit.rb b/src/lib/installation/clients/inst_doit.rb index c9f6df9b5..2c760bdfe 100644 --- a/src/lib/installation/clients/inst_doit.rb +++ b/src/lib/installation/clients/inst_doit.rb @@ -69,7 +69,7 @@ def main # Log all information about the installation/update ::Installation::InstallationInfo.instance.write( - Mode.update ? "Stating update" : "Starting installation" + Mode.update ? "Starting update" : "Starting installation" ) end From 62fd5dc407ac6c38d8e1791b06e2e7b3aa87a970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 18 May 2021 19:00:49 +0200 Subject: [PATCH 6/7] Register the callback --- src/lib/installation/clients/inst_install_inf.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/installation/clients/inst_install_inf.rb b/src/lib/installation/clients/inst_install_inf.rb index 4a6b9c28f..d952ba7e0 100644 --- a/src/lib/installation/clients/inst_install_inf.rb +++ b/src/lib/installation/clients/inst_install_inf.rb @@ -1,6 +1,7 @@ require "yast" require "network/install_inf_convertor" require "installation/dialogs/registration_url_dialog" +require "installation/installation_data" module Yast class InstInstallInfClient < Client @@ -16,6 +17,9 @@ class InstInstallInfClient < Client def main textdomain "installation" + # register the installation data dump callback + ::Installation::InstallationData.add + InstallInfConvertor.instance.write_netconfig return :next if Mode.auto From 98910e13c7dc4615842232e90c13adf8de80c304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 19 May 2021 16:45:22 +0200 Subject: [PATCH 7/7] Register the callback --- src/lib/installation/clients/inst_install_inf.rb | 4 ---- src/lib/installation/clients/installation.rb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/installation/clients/inst_install_inf.rb b/src/lib/installation/clients/inst_install_inf.rb index d952ba7e0..4a6b9c28f 100644 --- a/src/lib/installation/clients/inst_install_inf.rb +++ b/src/lib/installation/clients/inst_install_inf.rb @@ -1,7 +1,6 @@ require "yast" require "network/install_inf_convertor" require "installation/dialogs/registration_url_dialog" -require "installation/installation_data" module Yast class InstInstallInfClient < Client @@ -17,9 +16,6 @@ class InstInstallInfClient < Client def main textdomain "installation" - # register the installation data dump callback - ::Installation::InstallationData.add - InstallInfConvertor.instance.write_netconfig return :next if Mode.auto diff --git a/src/lib/installation/clients/installation.rb b/src/lib/installation/clients/installation.rb index 2d7eb8312..3286d0b20 100644 --- a/src/lib/installation/clients/installation.rb +++ b/src/lib/installation/clients/installation.rb @@ -30,6 +30,7 @@ # $Id$ require "ui/wizards/layout" +require "installation/installation_data" module Yast class InstallationClient < Client @@ -48,6 +49,9 @@ def main Yast.import "ProductFeatures" Yast.import "ProductControl" + # register the installation data dump callback + ::Installation::InstallationData.add + # log the inst-sys identification for easier debugging log_os_release