Merge pull request #54 from yast/review_140620_correct_autoyast_mode

enable correct autoyast mode
yast · Jun 20, 2014 · d47b481 · d47b481
2 parents c67e42c + 8efba10
commit d47b481
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jun 20 16:01:21 CEST 2014 - schubi@suse.de
+
+- Do not set Mode.config after the autoyast installation has been
+  booted into the system. The original Bug #881378 has been
+  fixed on another place. The current fix solves the Bug
+  bnc#883025
+- 3.1.35
+
 -------------------------------------------------------------------
 Thu Jun 12 14:33:38 UTC 2014 - schubi@suse.com
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.34
+Version:        3.1.35
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/AutoInstall.rb b/src/modules/AutoInstall.rb
@@ -149,11 +149,8 @@ def AutoInstall
               "AutoYaST upgrade mode already set, keeping it"
             )
           else
-            # The autoyast installation is in the second installation stage.
-            # So the target system has been booted.
-            # BNC#881378
-            Builtins.y2milestone("Enabling Auto-Installation config mode")
-            Mode.SetMode("autoinst_config")
+            Builtins.y2milestone("Enabling Auto-Installation mode")
+            Mode.SetMode("autoinstallation")
           end
         elsif Mode.autoinst
           Builtins.y2milestone(