Hello community,

here is the log from the commit of package autoyast2 for openSUSE:Factory 
checked in at 2015-09-24 07:17:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
 and      /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "autoyast2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes      2015-09-13 
09:44:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-09-24 
07:17:10.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Sep 18 10:50:53 CEST 2015 - sch...@suse.de
+
+- Writing network settings in first installation stage if the
+  second installation stage has been disabled ("second_stage")
+  in the general/mode section but a "networking" section has
+  also been defined. (bnc#944942)
+- 3.1.94
+
+-------------------------------------------------------------------

Old:
----
  autoyast2-3.1.93.tar.bz2

New:
----
  autoyast2-3.1.94.tar.bz2

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

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.eoVbyL/_old  2015-09-24 07:17:11.000000000 +0200
+++ /var/tmp/diff_new_pack.eoVbyL/_new  2015-09-24 07:17:11.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.93
+Version:        3.1.94
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ autoyast2-3.1.93.tar.bz2 -> autoyast2-3.1.94.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.93/package/autoyast2.changes 
new/autoyast2-3.1.94/package/autoyast2.changes
--- old/autoyast2-3.1.93/package/autoyast2.changes      2015-09-09 
07:24:10.000000000 +0200
+++ new/autoyast2-3.1.94/package/autoyast2.changes      2015-09-18 
11:15:11.000000000 +0200
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Sep 18 10:50:53 CEST 2015 - sch...@suse.de
+
+- Writing network settings in first installation stage if the
+  second installation stage has been disabled ("second_stage")
+  in the general/mode section but a "networking" section has
+  also been defined. (bnc#944942)
+- 3.1.94
+
+-------------------------------------------------------------------
 Mon Sep  7 22:32:50 UTC 2015 - igonzalezs...@suse.com
 
 - Fix premature loading of AutoInstall which prevented running
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.93/package/autoyast2.spec 
new/autoyast2-3.1.94/package/autoyast2.spec
--- old/autoyast2-3.1.93/package/autoyast2.spec 2015-09-09 07:24:10.000000000 
+0200
+++ new/autoyast2-3.1.94/package/autoyast2.spec 2015-09-18 11:15:11.000000000 
+0200
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.93
+Version:        3.1.94
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.93/src/clients/inst_autosetup.rb 
new/autoyast2-3.1.94/src/clients/inst_autosetup.rb
--- old/autoyast2-3.1.93/src/clients/inst_autosetup.rb  2015-09-09 
07:24:10.000000000 +0200
+++ new/autoyast2-3.1.94/src/clients/inst_autosetup.rb  2015-09-18 
11:15:11.000000000 +0200
@@ -148,17 +148,31 @@
 
       if Profile.current["networking"] &&
           ( Profile.current["networking"]["setup_before_proposal"] ||
-            semiauto_network )
-        Builtins.y2milestone("Networking setup before the proposal")
+            semiauto_network ||
+            !AutoinstConfig.second_stage()
+            )
+        Builtins.y2milestone(
+          "Importing Network settings from configuration file")
         Call.Function(
           "lan_auto",
           ["Import", Ops.get_map(Profile.current, "networking", {})]
         )
-        write_network = true
+        if Profile.current["networking"]["setup_before_proposal"]
+          Builtins.y2milestone("Networking setup before the proposal")
+          write_network = true
+        elsif !AutoinstConfig.second_stage()
+          # Second stage of installation will not be called but a
+          # network configuration is available. So this will be written
+          # while the general inst_finish process at the end of the
+          # first stage. But for the installation workflow the linuxrc
+          # network settings will be taken. (bnc#944942)
+          Builtins.y2milestone(
+            "Networking setup at the end of first installation stage")
+        end
       end
 
       if semiauto_network
-        Builtins.y2milestone("Networking manual setup")
+        Builtins.y2milestone("Networking manual setup before proposal")
         Call.Function("inst_lan", ["enable_next" => true])
         write_network = true
       end


Reply via email to