merged with master

package/autoyast2.changes

@@ -1,8 +1,64 @@
 -------------------------------------------------------------------
-Tue May 31 13:44:07 CEST 2016 - schubi@suse.de
+Wed Jul  6 17:56:38 CEST 2016 - schubi@suse.de
 
-- Fixed option "forceboot" in conjunction with kexec_reboot.
+- The entry "kexec_reboot" can be set by the AutoYaST configuration
+  file (general section) and should not be reset by any other
+  product description ("forceboot").
   (bnc#981434)
+- 3.1.137
+
+-------------------------------------------------------------------
+Wed Jul  6 16:56:38 CEST 2016 - schubi@suse.de
+
+- While AutoYaST installation the user can change the path of the
+  AutoYaST configuration file. Fix: This path will be updated in
+  /etc/install.inf too.
+  (bnc#963487)
+- 3.1.136
+
+-------------------------------------------------------------------
+Tue Jul  5 16:01:19 CEST 2016 - schubi@suse.de
+
+- System shutdown: Removed "autoyast" service shutdown.
+  It does not exist anymore. (bnc#986798)
+- 3.1.135
+
+-------------------------------------------------------------------
+Tue Jun 28 10:29:38 UTC 2016 - jreidinger@suse.com
+
+- Speed up installation (bnc#986649)
+- 3.1.134
+
+-------------------------------------------------------------------
+Tue Jun 21 06:16:12 UTC 2016 - igonzalezsosa@suse.com
+
+- Consider AutoYaST keep_install_network as set to 'true'
+  if it's not specified (bsc#984146)
+- Restore the keep_install_network default behavior present
+  in SLE 12 SP1 and openSUSE Leap 42.1
+- 3.1.133
+
+-------------------------------------------------------------------
+Mon Jun 20 15:31:07 CEST 2016 - schubi@suse.de
+
+- Fixing typo while reporting not supported modules.
+  (part of bnc#955878)
+- 3.1.132
+
+-------------------------------------------------------------------
+Mon Jun  6 10:34:08 UTC 2016 - igonzalezsosa@suse.com
+
+- Rename schema definition regarding SSH keys/configuration
+  so yast2-schema can find it correctly (fate#319624)
+- 3.1.131
+
+-------------------------------------------------------------------
+Fri Jun  3 15:22:02 UTC 2016 - igonzalezsosa@suse.com
+
+- Fix AutoYaST2 schema regarding SSH keys/configuration import
+  feature (fate#319624)
+- Stop generating autodocs (fate#320356)
+>>>>>>> master
 - 3.1.130
 
 -------------------------------------------------------------------
@@ -433,7 +489,7 @@ Tue May  5 15:05:18 CEST 2015 - locilka@suse.com
 Mon May  4 12:49:40 CEST 2015 - schubi@suse.de
 
 - Evaluate the correct host IP in order to read the proper
-  autoyast.xml file (bnc#928303, 908356, 916628)
+  autoyast.xml file (bnc#928303, bnc#908356, bnc#916628)
 - 3.1.75
 
 -------------------------------------------------------------------

package/autoyast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.130
+Version:        3.1.137
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/Makefile.am

@@ -93,7 +93,7 @@ schemafiles_DATA = \
   autoyast-rnc/classes-use.rnc \
   autoyast-rnc/classes-decl.rnc \
   autoyast-rnc/software.rnc \
-  autoyast-rnc/ssh-import.rnc \
+  autoyast-rnc/ssh_import.rnc \
   autoyast-rnc/reporting.rnc \
   autoyast-rnc/partitioning.rnc \
   autoyast-rnc/profile-misc.rnc \

src/autoyast-rnc/ssh-import.rnc → src/autoyast-rnc/ssh_import.rnc

@@ -4,7 +4,7 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 ssh_import =
   element ssh_import {
-    element import { BOOLEAN }? &
-    element config { BOOLEAN }? &
-    element device { text }?
+    element import      { BOOLEAN }? &
+    element copy_config { BOOLEAN }? &
+    element device      { text }?
   }

src/clients/inst_autoconfigure.rb

@@ -114,7 +114,7 @@ def main
         elsif Ops.get_boolean(
             Profile.current,
             ["networking", "keep_install_network"],
-            false
+            true
           ) == false
           removeNetwork(
             Ops.get_list(Profile.current, ["networking", "interfaces"], [])
@@ -271,7 +271,7 @@ def main
         if @online_update_ret == :reboot
           @script = {
             "filename" => "zzz_reboot",
-            "source"   => "chkconfig autoyast off\nshutdown -r now"
+            "source"   => "shutdown -r now"
           }
           AutoinstScripts.init = Builtins.add(AutoinstScripts.init, @script)
         end

src/clients/inst_autoinit.rb

@@ -58,28 +58,6 @@ def main
       Progress.Title(_("Preprobing stage"))
       Builtins.y2milestone("pre probing")
 
-      # // moved to autoset to fulfill fate #301193
-      #    // the DASD section in an autoyast profile can't be changed via pre-script
-      #    //
-      #     if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-      #         y2milestone("arch=s390 and remote_profile=true");
-      #         symbol ret = processProfile();
-      #         if( ret != `ok ) {
-      #             return ret;
-      #         }
-      #         y2milestone("processProfile=ok");
-      #         profileFetched = true;
-      #
-      #         // FIXME: the hardcoded stuff should be in the control.xml later
-      #         if( haskey(Profile::current, "dasd") ) {
-      #             y2milestone("dasd found");
-      #             Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-      #         }
-      #         if( haskey(Profile::current, "zfcp") ) {
-      #             y2milestone("zfcp found");
-      #             Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-      #         }
-      #     }
       @tmp = Convert.to_string(
         SCR.Read(path(".target.string"), "/etc/install.inf")
       )
@@ -105,7 +83,6 @@ def main
         return @ret if @ret != :ok
       end
 
-      Builtins.sleep(1000)
       Progress.Finish
 
       if !(Mode.autoupgrade && AutoinstConfig.ProfileInRootPart)
@@ -133,8 +110,6 @@ def main
 
       return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort
 
-      # AutoInstall::ProcessSpecialResources();
-
       :next
     end
 
@@ -144,7 +119,7 @@ def main
     def check_unsupported_profile_sections
       unsupported_sections = Y2ModuleConfig.unsupported_profile_sections
       if unsupported_sections.any?
-        log.error "Could not process these unsupported profile" \
+        log.error "Could not process these unsupported profile " \
           "sections: #{unsupported_sections}"
         Report.LongWarning(
           # TRANSLATORS: Error message, %s is replaced by newline-separated
@@ -175,22 +150,20 @@ def processProfile
           if newURI == ""
             return :abort
           else
+            # Updating new URI in /etc/install.inf (bnc#963487)
+            # SCR.Write does not work in inst-sys here.
+            WFM.Execute(
+              path(".local.bash"),
+              "sed -i \'/AutoYaST:/c\AutoYaST: #{newURI}\' /etc/install.inf"
+            )
+
             AutoinstConfig.ParseCmdLine(newURI)
             AutoinstConfig.SetProtocolMessage
             next
           end
         end
       end
 
-      # if (!ProfileLocation::Process())
-      # {
-      # 	y2error("Aborting...");
-      # 	return `abort;
-      # }
-
-      Builtins.sleep(1000)
-
-
       return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort
 
       #

src/modules/Profile.rb

@@ -217,7 +217,7 @@ def generalCompat
         if Ops.get_boolean(@current, ["general", "mode", "final_halt"], false)
           script = {
             "filename" => "zzz_halt",
-            "source"   => "chkconfig autoyast off\nshutdown -h now"
+            "source"   => "shutdown -h now"
           }
           if !Builtins.haskey(@current, "scripts")
             Ops.set(@current, "scripts", {})
@@ -240,7 +240,7 @@ def generalCompat
         if Ops.get_boolean(@current, ["general", "mode", "final_reboot"], false)
           script = {
             "filename" => "zzz_reboot",
-            "source"   => "chkconfig autoyast off\nshutdown -r now"
+            "source"   => "shutdown -r now"
           }
           if !Builtins.haskey(@current, "scripts")
             Ops.set(@current, "scripts", {})