[yast-commit] [ci_new_pac] JFYI yast2-installation -> sle12

25 Aug 2014

Script 'mail_helper' called by bg
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: bg.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-installation -> sle12



## BNC# 886464 : "FATE313149: in autoinst.xml "minimal-configuration" does not at all work (causes corruption of data)" (RESOLVED/FIXED)
## BNC# 892091 : "AutoYaST runs 2nd stage unconditionally" (NEW/)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes	2014-08-18 16:26:57.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes	2014-08-25 10:36:24.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Aug 25 09:15:13 CEST 2014 - schubi@suse.de
+
+- Autoyast
+  -- Disabling second installation stage via autoyast
+     configuration "second_stage".
+  -- Centralized minimal configuration and disabling more
+     configuration steps like X11, user, default_desktop,...
+  -- bnc#886464 and bnc#892091
+- 3.1.110
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-installation
- at least 19 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old)
 and      /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:43082 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-installation-3.1.109.tar.bz2

New:
----
  yast2-installation-3.1.110.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.EFtypT/_old	2014-08-25 15:37:29.000000000 +0200
+++ /var/tmp/diff_new_pack.EFtypT/_new	2014-08-25 15:37:29.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.109
+Version:        3.1.110
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-installation-3.1.109.tar.bz2 -> yast2-installation-3.1.110.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/package/yast2-installation.changes new/yast2-installation-3.1.110/package/yast2-installation.changes
--- old/yast2-installation-3.1.109/package/yast2-installation.changes	2014-08-18 15:49:49.000000000 +0200
+++ new/yast2-installation-3.1.110/package/yast2-installation.changes	2014-08-25 10:29:33.000000000 +0200
@@ -1,4 +1,15 @@
 -------------------------------------------------------------------
+Mon Aug 25 09:15:13 CEST 2014 - schubi@suse.de
+
+- Autoyast
+  -- Disabling second installation stage via autoyast
+     configuration "second_stage".
+  -- Centralized minimal configuration and disabling more
+     configuration steps like X11, user, default_desktop,...
+  -- bnc#886464 and bnc#892091
+- 3.1.110
+
+-------------------------------------------------------------------
 Mon Aug 18 12:30:53 UTC 2014 - jreidinger@suse.com
 
 - workaround problem with missing capabilities in image deployment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/package/yast2-installation.spec new/yast2-installation-3.1.110/package/yast2-installation.spec
--- old/yast2-installation-3.1.109/package/yast2-installation.spec	2014-08-18 15:49:49.000000000 +0200
+++ new/yast2-installation-3.1.110/package/yast2-installation.spec	2014-08-25 10:29:33.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.109
+Version:        3.1.110
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/desktop_finish.rb new/yast2-installation-3.1.110/src/clients/desktop_finish.rb
--- old/yast2-installation-3.1.109/src/clients/desktop_finish.rb	2014-08-18 15:49:49.000000000 +0200
+++ new/yast2-installation-3.1.110/src/clients/desktop_finish.rb	2014-08-25 10:29:33.000000000 +0200
@@ -31,8 +31,6 @@
 # $Id$
 #
 
-require "installation/minimal_installation"
-
 module Yast
   class DesktopFinishClient < Client
     def main
@@ -66,14 +64,13 @@
       Builtins.y2debug("param=%1", @param)
 
       if @func == "Info"
-        minimal_inst = ::Installation::MinimalInstallation.instance.enabled?
         return {
           "steps" => 1,
           # progress step title
           "title" => _(
             "Initializing default window manager..."
           ),
-          "when"  => minimal_inst ? [] : [:installation, :autoinst]
+          "when"  => [:installation, :autoinst]
         }
       elsif @func == "Write"
         # this detects WM and DM according to selected patterns and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/inst_finish.rb new/yast2-installation-3.1.110/src/clients/inst_finish.rb
--- old/yast2-installation-3.1.109/src/clients/inst_finish.rb	2014-08-18 15:49:49.000000000 +0200
+++ new/yast2-installation-3.1.110/src/clients/inst_finish.rb	2014-08-25 10:29:33.000000000 +0200
@@ -27,6 +27,9 @@
 #              Jiri Srain <jsrain@suse.de>
 #
 # $Id$
+
+require "installation/minimal_installation"
+
 module Yast
   class InstFinishClient < Client
     def main
@@ -120,63 +123,108 @@
       Pkg.TargetLoad
       PackageCallbacks.RestorePreviousProgressCallbacks
 
+      if ::Installation::MinimalInstallation.instance.enabled?
+        copy_files_steps = [
+          "autoinst_scripts1",
+          "copy_files",
+          "copy_systemfiles",
+          # For live installer only
+          Mode.live_installation ? "live_copy_files" : "",
+          "switch_scr"
+        ]
+
+        save_config_steps = [
+          "save_config",
+          # For live installer only
+          Mode.live_installation ? "live_save_config" : "",
+          "storage",
+          "kernel",
+        ]
+
+        save_settings_steps = [
+          "yast_inf",
+          "autoinst_scripts2",
+          "installation_settings"
+        ]
+
+        install_bootloader_steps = [
+          "prep_shrink", # ensure that prep partition is small enough for boot sector (bnc#867345)
+          "bootloader"
+        ]
+      else
+        # NOT minimal configuration
+
+        copy_files_steps = [
+          "autoinst_scripts1",
+          "copy_files",
+          "copy_systemfiles",
+          "clone",
+          # For live installer only
+          Mode.live_installation ? "live_copy_files" : "",
+          "switch_scr"
+        ]
+
+        save_config_steps = [
+          "ldconfig",
+          "save_config",
+          # For live installer only
+          Mode.live_installation ? "live_save_config" : "",
+          "default_target",
+          "desktop",
+          "storage",
+          "iscsi-client",
+          "fcoe-client",
+          "kernel",
+          "x11",
+          "proxy",
+          "pkg",
+          # product registration step is optional
+          WFM.ClientExists("scc_finish") ? "scc" : "",
+          "driver_update1",
+          # bnc #340733
+          "system_settings"
+        ]
+
+        save_settings_steps = [
+          "yast_inf",
+          "network",
+          "firewall_stage1",
+          "ntp-client",
+          "ssh_settings",
+          "save_hw_status",
+          "users",
+          "autoinst_scripts2",
+          "installation_settings"
+        ]
+
+        install_bootloader_steps = [
+          "prep_shrink", # ensure that prep partition is small enough for boot sector (bnc#867345)
+          "bootloader",
+          ProductFeatures.GetBooleanFeature("globals", "enable_kdump") == true ? "kdump" : "",
+          "cio_ignore"
+        ]
+      end
+
       @stages = [
         {
           "id"    => "copy_files",
           # progress stage
           "label" => _("Copy files to installed system"),
-          "steps" => [
-            "autoinst_scripts1",
-            "copy_files",
-            "copy_systemfiles",
-            "clone",
-            # For live installer only
-            Mode.live_installation ? "live_copy_files" : "",
-            "switch_scr"
-          ],
+          "steps" => copy_files_steps,
           "icon"  => "pattern-basis"
         },
         {
           "id"    => "save_config",
           # progress stage
           "label" => _("Save configuration"),
-          "steps" => [
-            "ldconfig",
-            "save_config",
-            # For live installer only
-            Mode.live_installation ? "live_save_config" : "",
-            "default_target",
-            "desktop",
-            "storage",
-            "iscsi-client",
-            "fcoe-client",
-            "kernel",
-            "x11",
-            "proxy",
-            "pkg",
-            # product registration step is optional
-            WFM.ClientExists("scc_finish") ? "scc" : "",
-            "driver_update1",
-            # bnc #340733
-            "system_settings"
-          ],
+          "steps" => save_config_steps,
           "icon"  => "yast-desktop-select"
         },
         {
           "id"    => "save_settings",
           # progress stage
           "label" => _("Save installation settings"),
-          "steps" => [
-            "yast_inf",
-            "network",
-            "firewall_stage1",
-            "ntp-client",
-            "ssh_settings",
-            "save_hw_status",
-            "users",
-            "autoinst_scripts2",
-            "installation_settings"
-          ],
+          "steps" => save_settings_steps,
           "icon"  => "yast-network"
         },
         # bnc#860089: Save bootloader as late as possible
@@ -185,12 +233,7 @@
           "id"    => "install_bootloader",
           # progress stage
           "label" => _("Install boot manager"),
-          "steps" => [
-            "prep_shrink", # ensure that prep partition is small enough for boot sector (bnc#867345)
-            "bootloader",
-            ProductFeatures.GetBooleanFeature("globals", "enable_kdump") == true ? "kdump" : "",
-            "cio_ignore"
-          ],
+          "steps" => install_bootloader_steps,
           "icon"  => "yast-bootloader"
         },
         {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/clients/save_hw_status_finish.rb new/yast2-installation-3.1.110/src/clients/save_hw_status_finish.rb
--- old/yast2-installation-3.1.109/src/clients/save_hw_status_finish.rb	2014-08-18 15:49:49.000000000 +0200
+++ new/yast2-installation-3.1.110/src/clients/save_hw_status_finish.rb	2014-08-25 10:29:36.000000000 +0200
@@ -31,8 +31,6 @@
 # $Id$
 #
 
-require "installation/minimal_installation"
-
 module Yast
   class SaveHwStatusFinishClient < Client
     def main
@@ -63,12 +61,11 @@
       Builtins.y2debug("param=%1", @param)
 
       if @func == "Info"
-        minimal_inst = ::Installation::MinimalInstallation.instance.enabled?
         return {
           "steps" => 1,
           # progress step title
           "title" => _("Saving hardware configuration..."),
-          "when"  => minimal_inst ? [] : [:installation, :update, :autoinst]
+          "when"  => [:installation, :update, :autoinst]
         }
       elsif @func == "Write"
         # Package yast2-printer needs to be installed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.109/src/include/installation/inst_inc_first.rb new/yast2-installation-3.1.110/src/include/installation/inst_inc_first.rb
--- old/yast2-installation-3.1.109/src/include/installation/inst_inc_first.rb	2014-08-18 15:49:49.000000000 +0200
+++ new/yast2-installation-3.1.110/src/include/installation/inst_inc_first.rb	2014-08-25 10:29:36.000000000 +0200
@@ -44,6 +44,7 @@
       Yast.import "String"
       Yast.import "Mode"
       Yast.import "ProductFeatures"
+      Yast.import "AutoinstConfig"
 
       Yast.include include_target, "installation/misc.rb"
     end
@@ -173,26 +174,34 @@
     def HandleSecondStageRequired
       if Stage.initial
         # the current one is 'initial'
-        # after reboot/kexec it would be 'continue'
-        stage_to_check = "continue"
-
-        # for matching the control file
-        mode_to_check = Mode.mode
-
-        # file name
-        run_yast_at_boot = Builtins.sformat(
-          "%1/%2",
-          Installation.destdir,
-          Installation.run_yast_at_boot
-        )
-
-        Builtins.y2milestone(
-          "Checking RunRequired (%1, %2)",
-          stage_to_check,
-          mode_to_check
-        )
+        run_second_stage = true
+        if (Mode.autoinst || Mode.autoupgrade)
+           !AutoinstConfig.second_stage
+          run_second_stage = false
+          Builtins.y2milestone("Autoyast: second stage is disabled")
+        else
+          # after reboot/kexec it would be 'continue'
+          stage_to_check = "continue"
+
+          # for matching the control file
+          mode_to_check = Mode.mode
+
+          # file name
+          run_yast_at_boot = Builtins.sformat(
+            "%1/%2",
+            Installation.destdir,
+            Installation.run_yast_at_boot
+          )
+
+          Builtins.y2milestone(
+            "Checking RunRequired (%1, %2)",
+            stage_to_check,
+            mode_to_check
+          )
+          run_second_stage = ProductControl.RunRequired(stage_to_check, mode_to_check)
+        end
 
-        if ProductControl.RunRequired(stage_to_check, mode_to_check)
+        if run_second_stage
           Builtins.y2milestone("Running the second stage is required")
           WFM.Write(path(".local.string"), run_yast_at_boot, "")
           WriteSecondStageRequired(true)

continue with "q"...


Checked in at Mon Aug 25 15:37:50 CEST 2014 by bg

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

bg

tags

participants (1)