commit autoyast2 for openSUSE:Factory
Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2018-11-10 16:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Sat Nov 10 16:48:12 2018 rev:250 rq:646092 version:4.0.66 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2018-11-01 19:07:43.582027188 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2018-11-10 16:48:16.668576835 +0100 @@ -1,0 +2,8 @@ +Fri Nov 2 12:57:05 CET 2018 - schubi@suse.de + +- Writing security settings in first AY installation stage. + So other modules (e.g. users) can rely on these settings now. + (bnc#1112769) +- 4.0.66 + +------------------------------------------------------------------- Old: ---- autoyast2-4.0.65.tar.bz2 New: ---- autoyast2-4.0.66.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.mI05Cq/_old 2018-11-10 16:48:17.128576252 +0100 +++ /var/tmp/diff_new_pack.mI05Cq/_new 2018-11-10 16:48:17.128576252 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.65 +Version: 4.0.66 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,9 +64,11 @@ Requires: yast2 >= 4.0.60 Requires: yast2-core Requires: yast2-country >= 3.1.13 -Requires: yast2-network >= 3.1.145 Requires: yast2-ntp-client >= 4.0.1 +# Moving security module to first installation stage +Requires: yast2-network >= 3.1.145 Requires: yast2-schema +Requires: yast2-security >= 4.1.1 Requires: yast2-transfer >= 2.21.0 Requires: yast2-xml # AutoinstIssues::NoProposal ++++++ autoyast2-4.0.65.tar.bz2 -> autoyast2-4.0.66.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.65/package/autoyast2.changes new/autoyast2-4.0.66/package/autoyast2.changes --- old/autoyast2-4.0.65/package/autoyast2.changes 2018-10-29 13:46:19.000000000 +0100 +++ new/autoyast2-4.0.66/package/autoyast2.changes 2018-11-02 16:22:44.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 2 12:57:05 CET 2018 - schubi@suse.de + +- Writing security settings in first AY installation stage. + So other modules (e.g. users) can rely on these settings now. + (bnc#1112769) +- 4.0.66 + +------------------------------------------------------------------- Thu Oct 25 13:35:34 CEST 2018 - schubi@suse.de - Saving y2logs after the installation has been finished. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.65/package/autoyast2.spec new/autoyast2-4.0.66/package/autoyast2.spec --- old/autoyast2-4.0.65/package/autoyast2.spec 2018-10-29 13:46:19.000000000 +0100 +++ new/autoyast2-4.0.66/package/autoyast2.spec 2018-11-02 16:22:44.000000000 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.65 +Version: 4.0.66 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,6 +65,8 @@ Requires: yast2-core Requires: yast2-country >= 3.1.13 Requires: yast2-ntp-client >= 4.0.1 +# Moving security module to first installation stage +Requires: yast2-security >= 4.1.1 Requires: yast2-network >= 3.1.145 Requires: yast2-schema Requires: yast2-transfer >= 2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.65/src/clients/inst_autosetup.rb new/autoyast2-4.0.66/src/clients/inst_autosetup.rb --- old/autoyast2-4.0.65/src/clients/inst_autosetup.rb 2018-10-29 13:46:19.000000000 +0100 +++ new/autoyast2-4.0.66/src/clients/inst_autosetup.rb 2018-11-02 16:22:44.000000000 +0100 @@ -55,6 +55,7 @@ _("Execute pre-install user scripts"), _("Configure General Settings "), _("Set up language"), + _("Configure security settings"), _("Create partition plans"), _("Configure Bootloader"), _("Registration"), @@ -69,6 +70,7 @@ _("Executing pre-install user scripts..."), _("Configuring general settings..."), _("Setting up language..."), + _("Configuring security settings"), _("Creating partition plans..."), _("Configuring Bootloader..."), _("Registering the system..."), @@ -89,7 +91,7 @@ ) - return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless) Progress.NextStage @@ -104,7 +106,7 @@ return :abort if readModified == :abort - return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless) # # Partitioning and Storage @@ -254,7 +256,7 @@ end - return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless) # moved here from autoinit for fate #301193 # needs testing @@ -276,6 +278,12 @@ Progress.NextStage + # Importing security settings + autosetup_security + return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless) + + Progress.NextStage + probe_storage if modified_profile? || dasd_or_zfcp if Profile.current["partitioning_advanced"] && !Profile.current["partitioning_advanced"].empty? @@ -309,7 +317,7 @@ # So the software selection is aware and can manage packages # needed by the bootloader (bnc#876161) - return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless) Progress.NextStage return :abort unless WFM.CallFunction( @@ -320,7 +328,7 @@ # Registration # FIXME: There is a lot of duplicate code with inst_autoupgrade. - return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless) Progress.NextStage # The configuration_management has to be called before software selection. @@ -341,7 +349,7 @@ # Software - return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless) Progress.NextStage @@ -454,6 +462,17 @@ end end + # Import security settings from profile + def autosetup_security + security_config = Profile.current["security"] + if security_config + # Do not start it in second installation stage again. + # Writing will be called in inst_finish. + Profile.remove_sections("security") + Call.Function("security_auto", ["Import", security_config]) + end + end + # Add YaST2 packages dependencies def add_yast2_dependencies keys = Profile.current.keys.select do |k|
participants (1)
-
root