Merge remote-tracking branch 'origin/master' into extend_firewall_api

.rubocop.yml

@@ -34,6 +34,10 @@ Style/AccessorMethodName:
   Exclude:
     - library/systemd/src/modules/systemd_target.rb
 
+# set reasonable ruby version
+AllCops:
+  TargetRubyVersion: 2.2
+
 # UI_ID module is not camel case
 Style/ClassAndModuleCamelCase:
   Enabled: false

.yardopts

@@ -1 +1 @@
---no-private --markup markdown --protected library/*/src/**/*.rb --readme README.md --output-dir ./doc/autodocs - library/cwm/doc/CWM.md library/systemd/doc/services_and_sockets.md
+--no-private --markup markdown --protected library/*/src/**/*.rb --readme README.md --output-dir ./doc/autodocs - library/cwm/doc/CWM.md library/systemd/doc/services_and_sockets.md library/system/doc/system_services.md

Dockerfile

@@ -1,7 +1,7 @@
 # Use this base image
 # - built: https://hub.docker.com/r/yastdevel/ruby/
 # - source: https://github.com/yast/docker-yast-ruby
-FROM yastdevel/ruby:sle15
+FROM yastdevel/ruby
 COPY . /usr/src/app
 # English messages, UTF-8, "C" locale for numeric formatting tests
 ENV LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C

Rakefile

@@ -1,7 +1,5 @@
 require "yast/rake"
 
-Yast::Tasks.submit_to :sle15
-
 Yast::Tasks.configuration do |conf|
   # lets ignore license check for now
   conf.skip_license_check << /.*/

library/control/src/modules/Installation.rb

@@ -40,6 +40,9 @@
 
 module Yast
   class InstallationClass < Module
+    # usual mountpoint for the source (i.e. CD)
+    SOURCEDIR = "/run/YaST2/mount".freeze
+
     def main
       Yast.import "Stage"
       Yast.import "Linuxrc"
@@ -56,10 +59,6 @@ def main
       # set to "/" when the SCR is restarted in the target system.
       @scr_destdir = "/"
 
-      # usual mountpoint for the source (i.e. CD)
-
-      @sourcedir = "/var/adm/mount"
-
       @yast2dir = "/var/lib/YaST2"
 
       @mountlog = Ops.add(Directory.logdir, "/y2logMount")
@@ -287,10 +286,19 @@ def no_x11
       @_no_x11
     end
 
+    # Gets directory suitable for source mount. It ensures that directory exists.
+    # It does not ensure unmounting previous content.
+    #
+    # @return [String]
+    def sourcedir
+      ::FileUtils.mkdir_p(SOURCEDIR) unless ::File.exist?(SOURCEDIR)
+
+      SOURCEDIR
+    end
+
     publish variable: :scr_handle, type: "integer"
     publish variable: :destdir, type: "string"
     publish variable: :scr_destdir, type: "string"
-    publish variable: :sourcedir, type: "string"
     publish variable: :yast2dir, type: "string"
     publish variable: :mountlog, type: "string"
     publish variable: :encoding, type: "string"
@@ -326,6 +334,7 @@ def no_x11
     publish function: :x11_setup_needed, type: "boolean ()"
     publish function: :text_fallback, type: "boolean ()"
     publish function: :no_x11, type: "boolean ()"
+    publish function: :sourcedir, type: "string ()"
   end
 
   Installation = InstallationClass.new

library/control/src/modules/ProductFeatures.rb

@@ -69,8 +69,12 @@ def main
           "vendor_url"                      => "",
           "enable_clone"                    => false,
           "disable_os_prober"               => false,
+          "enable_local_users"              => true,
           # FATE #304865
-          "base_product_license_directory"  => "/etc/YaST2/licenses/base/"
+          "base_product_license_directory"  => "/etc/YaST2/licenses/base/",
+          "full_system_media_name"          => "",
+          "full_system_download_url"        => "",
+          "save_y2logs"                     => true
         },
         "partitioning" => {
           "use_flexible_partitioning"    => false,
@@ -238,6 +242,27 @@ def GetBooleanFeature(section, feature)
       Ops.is_string?(value) && Builtins.tolower(Convert.to_string(value)) == "yes"
     end
 
+    # Get value of a boolean feature with a fallback value.
+    #
+    # @note This is a stable API function
+    # @param [String] section string section of the feature
+    # @param [String] feature feature name
+    # @param [Boolean] fallback
+    #
+    # @return [Boolean] the feature value or fallback if not specified
+    def GetBooleanFeatureWithFallback(section, feature, fallback)
+      value = GetFeature(section, feature)
+      return fallback if value.nil?
+      return value if Ops.is_boolean?(value)
+
+      if value.respond_to?(:downcase)
+        return true  if ["yes", "true"].include?(value.downcase)
+        return false if ["no", "false"].include?(value.downcase)
+      end
+
+      fallback
+    end
+
     # Get value of a feature
     # @note This is a stable API function
     # @param [String] section string section of the feature
@@ -355,6 +380,7 @@ def ClearOverlay
     publish function: :InitIfNeeded, type: "void ()"
     publish function: :GetFeature, type: "any (string, string)"
     publish function: :GetBooleanFeature, type: "boolean (string, string)"
+    publish function: :GetBooleanFeatureWithFallback, type: "boolean (string, string, boolean)"
     publish function: :GetIntegerFeature, type: "integer (string, string)"
     publish function: :SetFeature, type: "void (string, string, any)"
     publish function: :SetStringFeature, type: "void (string, string, string)"

library/control/src/modules/WorkflowManager.rb

@@ -439,7 +439,18 @@ def control_file(source)
       dir = addon_control_dir(src, cleanup: true)
       fetch_package(src, package, dir)
 
-      path = File.join(dir, "installation.xml")
+      # lets first try FHS compliant path (bsc#1114573)
+      # sadly no glob escaping - https://bugs.ruby-lang.org/issues/8258
+      # but as we generate directory, it should be ok
+      files = Dir.glob("#{dir}/usr/share/system-roles/*.xml")
+      if files.size == 1
+        path = files.first
+      elsif files.size > 1
+        log.error "more then one file in system role #{files.inspect}"
+        path = files.first
+      else
+        path = File.join(dir, "installation.xml")
+      end
       return nil unless File.exist?(path)
 
       log.info("installation.xml path: #{path}")
@@ -1494,10 +1505,14 @@ def merge_product_workflow(product)
       log.info "Merging #{product.label} workflow"
 
       if merged_base_product
-        Yast::WorkflowManager.RemoveWorkflow(:package, 0, merged_base_product.installation_package)
+        Yast::WorkflowManager.RemoveWorkflow(
+          :package,
+          merged_base_product.installation_package_repo,
+          merged_base_product.installation_package
+        )
       end
 
-      AddWorkflow(:package, 0, product.installation_package)
+      AddWorkflow(:package, product.installation_package_repo, product.installation_package)
       MergeWorkflows()
       RedrawWizardSteps()
       self.merged_base_product = product
@@ -1604,12 +1619,18 @@ def package_repository(package_name)
       if pkgs.empty?
         log.warn("The installer extension package #{package_name} was not found")
         return nil
-      elsif pkgs.size > 1
+      end
+
+      latest_package = pkgs.reduce(nil) do |a, p|
+        !a || (Pkg.CompareVersions(a["version"], p["version"]) < 0) ? p : a
+      end
+
+      if pkgs.size > 1
         log.warn("More than one control package found: #{pkgs}")
-        log.warn("Using the first one: #{pkgs.first}")
+        log.info("Using the latest package: #{latest_package}")
       end
 
-      pkgs.first["source"]
+      latest_package["source"]
     end
 
     # Download and extract a package from a repository.

library/control/test/Makefile.am

@@ -1,5 +1,6 @@
 TESTS = \
   InstExtensionImage_test.rb \
+  installation_test.rb \
   ProductFeatures_test.rb \
   workflow_manager_test.rb