Revert "Revert "Save the software selection for using it later in Aut…

…oYaST (bsc#956325, bsc#910728)""

This reverts commit 5e58fc8.

package/yast2-installation.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 26 13:15:19 UTC 2015 - lslezak@suse.cz
+
+- Save the software selection for using it later in AutoYaST
+  when deploying installation images (bsc#956325, bsc#910728)
+- 3.1.162.2
+
 -------------------------------------------------------------------
 Thu Nov 26 09:09:59 UTC 2015 - jreidinger@suse.com
 

package/yast2-installation.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.162.1
+Version:        3.1.162.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -43,8 +43,8 @@ BuildRequires: yast2 >= 3.1.126
 # Yast::Remote
 BuildRequires: yast2-network
 
-# clone_system client
-Requires:       autoyast2-installation >= 3.1.5
+# AutoinstSoftware.SavePackageSelection()
+Requires:       autoyast2-installation >= 3.1.101.3
 
 # Wizard.OpenLeftTitleNextBackDialog
 Requires:	yast2 >= 3.1.126

src/lib/installation/clients/inst_deploy_image.rb

@@ -18,8 +18,13 @@
 # To contact Novell about this file by physical or electronic mail, you may find
 # current contact information at www.novell.com.
 # ------------------------------------------------------------------------------
+
+require "installation/clone_settings"
+
 module Yast
   class InstDeployImageClient < Client
+    include Yast::Logger
+
     def main
       Yast.import "Pkg"
       Yast.import "Installation"
@@ -55,6 +60,13 @@ def main
         end
       end
 
+      if ::Installation::CloneSettings.instance.enabled?
+        log.info "Cloning enabled, storing the current package selection"
+        # store the software selection for AutoYaST for later (bsc#956325)
+        Yast.import "AutoinstSoftware"
+        AutoinstSoftware.SavePackageSelection
+      end
+
       Builtins.y2milestone("Deploying images")
 
       SlideShow.MoveToStage("images")