Merge f820d0b into ce817af

yast · Jul 29, 2020 · fb09a77 · fb09a77
2 parents ce817af + f820d0b
commit fb09a77
Show file tree

Hide file tree

Showing 6 changed files with 222 additions and 410 deletions.
diff --git a/control/test.xml b/control/test.xml
@@ -429,10 +429,6 @@ textdomain="control"
 	            <label>Perform Installation</label>
                     <name>kickoff</name>
                 </module>
-                <module>
-	            <label>Perform Installation</label>
-                    <name>autoimage</name>
-                </module>
                 <module>
 	            <label>Perform Installation</label>
                     <name>rpmcopy</name>

diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 27 17:04:26 CEST 2020 - schubi@suse.de
+
+- AY: Removed "image" section from "software" section
+  (bsc#1140711).
+- 4.3.13
+
 -------------------------------------------------------------------
 Mon Jul 27 13:43:29 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.3.12
+Version:        4.3.13
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only
@@ -39,6 +39,8 @@ BuildRequires:  rubygem(%{rb_default_ruby_abi}:yast-rake)
 BuildRequires:  yast2 >= 4.2.56
 # Y2Packager::MediumType
 BuildRequires:  yast2-packager >= 4.2.27
+# CIOIgnore
+BuildRequires:  yast2-bootloader
 # using /usr/bin/udevadm
 BuildRequires:  yast2-storage-ng >= 4.2.71
 # Y2Network::NtpServer
@@ -66,6 +68,8 @@ Requires:       yast2-country-data >= 2.16.11
 Requires:       yast2-pkg-bindings >= 3.1.33
 # Y2Packager::MediumType
 Requires:       yast2-packager >= 4.2.22
+# CIOIgnore
+Requires:       yast2-bootloader
 # use in startup scripts
 Requires:       initviocons
 # Proxy settings for 2nd stage (bnc#764951)
@@ -180,7 +184,8 @@ systemctl enable YaST2-Firstboot.service
 %postun
 %service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service
 
-%endif #suse_version
+#suse_version
+%endif
 
 %files
 

diff --git a/src/clients/deploy_image_auto.rb b/src/clients/deploy_image_auto.rb
@@ -1,2 +1,2 @@
 require "installation/clients/deploy_image_auto"
-Yast::DeployImageAutoClient.new.main
+Yast::DeployImageAutoClient.run