Merge pull request #38 from vmoravec/fix-missing-module

Replace the non-existing yast module (bnc#868833)
yast · Mar 18, 2014 · ad4fa1c · ad4fa1c
2 parents cdbcf0f + 6155002
commit ad4fa1c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 18 09:27:23 UTC 2014 - vmoravec@suse.com
+
+- Fix missing module (bnc#868833)
+- 3.1.20
+
 -------------------------------------------------------------------
 Mon Mar  3 13:05:07 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.19
+Version:        3.1.20
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -90,8 +90,8 @@ Requires:       yast2-core
 Requires:       yast2-country
 Requires:       yast2-ncurses
 Requires:       yast2-packager
-# SystemdTargetClass::BaseTargets
-Requires:       yast2-services-manager >= 0.0.13
+# ServicesManagerTargetClass::BaseTargets
+Requires:       yast2-services-manager >= 3.1.10
 Requires:       yast2-slp
 Requires:       yast2-storage
 Requires:       yast2-transfer >= 2.21.0

diff --git a/src/clients/inst_autosetup.rb b/src/clients/inst_autosetup.rb
@@ -342,15 +342,15 @@ def main
       Builtins.y2milestone("autoyast - configured default target: '#{@default_target}'")
 
       if !@default_target.empty?
-        SystemdTarget.default_target = @default_target
+        ServicesManagerTarget.default_target = @default_target
       else
-        SystemdTarget.default_target = Installation.x11_setup_needed &&
+        ServicesManagerTarget.default_target = Installation.x11_setup_needed &&
           Arch.x11_setup_needed &&
           Pkg.IsSelected("xorg-x11-server") ? Target::GRAPHICAL : Target::MULTIUSER
       end
 
       Builtins.y2milestone(
-        "autoyast - setting default target to: #{SystemdTarget.default_target}"
+        "autoyast - setting default target to: #{ServicesManagerTarget.default_target}"
       )
 
       #    AutoInstall::PXELocalBoot();

diff --git a/src/modules/AutoinstConfig.rb b/src/modules/AutoinstConfig.rb
@@ -9,12 +9,12 @@
 require "yast"
 
 module Yast
-  import "SystemdTarget"
+  import "ServicesManagerTarget"
 
   class AutoinstConfigClass < Module
 
     module Target
-      include SystemdTargetClass::BaseTargets
+      include ServicesManagerTargetClass::BaseTargets
     end
 
     def main