Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2015-05-06 07:48:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-27 22:08:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-05-06 07:48:31.000000000 +0200
@@ -1,0 +2,13 @@
+Tue May 5 15:05:18 CEST 2015 - locilka@suse.com
+
+- Reporting unknown and unsupported profile sections (bnc#925381)
+- 3.1.76
+
+-------------------------------------------------------------------
+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)
+- 3.1.75
+
+-------------------------------------------------------------------
Old:
----
autoyast2-3.1.74.tar.bz2
New:
----
autoyast2-3.1.76.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.66fAiG/_old 2015-05-06 07:48:32.000000000 +0200
+++ /var/tmp/diff_new_pack.66fAiG/_new 2015-05-06 07:48:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.74
+Version: 3.1.76
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ autoyast2-3.1.74.tar.bz2 -> autoyast2-3.1.76.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.74/package/autoyast2.changes new/autoyast2-3.1.76/package/autoyast2.changes
--- old/autoyast2-3.1.74/package/autoyast2.changes 2015-04-27 10:29:12.000000000 +0200
+++ new/autoyast2-3.1.76/package/autoyast2.changes 2015-05-05 16:39:08.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Tue May 5 15:05:18 CEST 2015 - locilka@suse.com
+
+- Reporting unknown and unsupported profile sections (bnc#925381)
+- 3.1.76
+
+-------------------------------------------------------------------
+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)
+- 3.1.75
+
+-------------------------------------------------------------------
Fri Apr 10 10:48:04 CEST 2015 - schubi@suse.de
- New autoinst flag in general/mode section:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.74/package/autoyast2.spec new/autoyast2-3.1.76/package/autoyast2.spec
--- old/autoyast2-3.1.74/package/autoyast2.spec 2015-04-27 10:29:12.000000000 +0200
+++ new/autoyast2-3.1.76/package/autoyast2.spec 2015-05-05 16:39:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.74
+Version: 3.1.76
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.74/src/clients/inst_autoconfigure.rb new/autoyast2-3.1.76/src/clients/inst_autoconfigure.rb
--- old/autoyast2-3.1.74/src/clients/inst_autoconfigure.rb 2015-04-27 10:29:12.000000000 +0200
+++ new/autoyast2-3.1.76/src/clients/inst_autoconfigure.rb 2015-05-05 16:39:08.000000000 +0200
@@ -9,6 +9,8 @@
# $Id$
module Yast
class InstAutoconfigureClient < Client
+ include Yast::Logger
+
def main
Yast.import "UI"
textdomain "autoinst"
@@ -22,6 +24,7 @@
Yast.import "Y2ModuleConfig"
Yast.import "Label"
Yast.import "Mode"
+ Yast.import "Report"
@current_step = 0 # Required by logStep()
@@ -72,11 +75,39 @@
Wizard.DisableAbortButton
-
-
Builtins.y2debug("Module map: %1", Y2ModuleConfig.ModuleMap)
Builtins.y2debug("Current profile: %1", Profile.current)
+ unsupported_sections = Y2ModuleConfig.unsupported_profile_sections
+ if unsupported_sections.any?
+ log.error "Could not process these unsupported profile sections: #{unsupported_sections}"
+ Report.LongError(
+ # TRANSLATORS: Error message, %s is replaced by newline-separated
+ # list of unsupported sections of the profile
+ # Do not translate words in brackets
+ _(
+ "These sections of AutoYaST profile are not supported anymore:\n\n%s\n\n" \
+ "Please, use, e.g., <scripts/> or <files/> to change the configuration."
+ ) % unsupported_sections.map{|section| "<#{section}/>"}.join("\n")
+ )
+ end
+
+ # Report only those that are 'not unsupported', these were already reported
+ unknown_sections = Y2ModuleConfig.unhandled_profile_sections - unsupported_sections
+ if unknown_sections.any?
+ log.error "Could not process these unknown profile sections: #{unknown_sections}"
+ Report.LongError(
+ # TRANSLATORS: Error message, %s is replaced by newline-separated
+ # list of unknown sections of the profile
+ # Do not translate words in brackets
+ _(
+ "These sections of AutoYaST profile cannot be processed on this system:\n\n%s\n\n" \
+ "Maybe they were misspelled or your profile does not contain " \
+ "all the needed YaST packages in <software/> section."
+ ) %
+ unknown_sections.map{|section| "<#{section}/>"}.join("\n")
+ )
+ end
@deps = Y2ModuleConfig.Deps
@@ -104,11 +135,11 @@
d = Ops.get_map(r, "data", {})
if Ops.get_string(d, "X-SuSE-YaST-AutoInst", "") == "all" ||
Ops.get_string(d, "X-SuSE-YaST-AutoInst", "") == "write"
- if Builtins.haskey(d, "X-SuSE-YaST-AutoInstResource") &&
- Ops.get_string(d, "X-SuSE-YaST-AutoInstResource", "") != ""
+ if Builtins.haskey(d, Yast::Y2ModuleConfigClass::RESOURCE_NAME_KEY) &&
+ Ops.get_string(d, Yast::Y2ModuleConfigClass::RESOURCE_NAME_KEY, "") != ""
@resource = Ops.get_string(
d,
- "X-SuSE-YaST-AutoInstResource",
+ Yast::Y2ModuleConfigClass::RESOURCE_NAME_KEY,
"unknown"
)
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.74/src/modules/AutoInstallRules.rb new/autoyast2-3.1.76/src/modules/AutoInstallRules.rb
--- old/autoyast2-3.1.74/src/modules/AutoInstallRules.rb 2015-04-27 10:29:12.000000000 +0200
+++ new/autoyast2-3.1.76/src/modules/AutoInstallRules.rb 2015-05-05 16:39:08.000000000 +0200
@@ -159,12 +159,18 @@
# @return [String] host ID
def getHostid
if Stage.initial
- @hostaddress = Convert.to_string(SCR.Read(path(".etc.install_inf.IP")))
+ wicked_ret = SCR.Execute(path(".target.bash_output"), "/usr/sbin/wicked show --verbose all|grep pref-src")
+ if wicked_ret["exit"] == 0
+ stdout = wicked_ret["stdout"].split
+ @hostaddress = stdout[stdout.index("pref-src")+1]
+ else
+ log.warn "Cannot evaluate IP address with wicked: #{wicked_ret["stderr"]}"
+ @hostaddress = nil
+ end
else
@hostaddress = "192.168.1.1" # FIXME
end
- hex = IP.ToHex(@hostaddress)
- hex
+ IP.ToHex(@hostaddress)
end
# Return host name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.74/src/modules/Profile.rb new/autoyast2-3.1.76/src/modules/Profile.rb
--- old/autoyast2-3.1.74/src/modules/Profile.rb 2015-04-27 10:29:12.000000000 +0200
+++ new/autoyast2-3.1.76/src/modules/Profile.rb 2015-05-05 16:39:08.000000000 +0200
@@ -10,6 +10,37 @@
module Yast
class ProfileClass < Module
+ # All these sections are handled by AutoYaST (or Installer) itself,
+ # it doesn't use any external AutoYaST client for them
+ GENERIC_PROFILE_SECTIONS = [
+ # Bug: this is already in every auto-generated profile
+ "deploy_image",
+ # AutoYaST configuration - complete configuration files
+ "files",
+ # AutoYaST configuration - default values
+ "general",
+ # AutoYaST has its own partitioning
+ "partitioning",
+ # AutoYaST has its Preboot Execution Environment configuration
+ "pxe",
+ # AutoYaST configuration - pre and post-install scripts
+ "scripts",
+ # AutoYaST has also its own software selection
+ "software",
+ # Bug: This top-level entry belongs to users / groups
+ "user_defaults",
+ ]
+
+ # Dropped YaST modules that used to provide AutoYaST functionality
+ # bsc#925381
+ OBSOLETE_PROFILE_SECTIONS = [
+ # FATE#316185: Drop YaST AutoFS module
+ "autofs",
+ # FATE#308682: Drop yast2-backup and yast2-restore modules
+ "restore",
+ "sshd",
+ ]
+
def main
Yast.import "UI"
textdomain "autoinst"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.74/src/modules/Y2ModuleConfig.rb new/autoyast2-3.1.76/src/modules/Y2ModuleConfig.rb
--- old/autoyast2-3.1.74/src/modules/Y2ModuleConfig.rb 2015-04-27 10:29:12.000000000 +0200
+++ new/autoyast2-3.1.76/src/modules/Y2ModuleConfig.rb 2015-05-05 16:39:08.000000000 +0200
@@ -10,6 +10,11 @@
module Yast
class Y2ModuleConfigClass < Module
+ # Key for AutoYaST client name in desktop file
+ RESOURCE_NAME_KEY = "X-SuSE-YaST-AutoInstResource"
+
+ include Yast::Logger
+
def main
textdomain "autoinst"
@@ -44,7 +49,7 @@
"Icon",
"Hidden",
"X-SuSE-YaST-AutoInst",
- "X-SuSE-YaST-AutoInstResource",
+ RESOURCE_NAME_KEY,
"X-SuSE-YaST-AutoInstClient",
"X-SuSE-YaST-Group",
"X-SuSE-YaST-AutoInstMerge",
@@ -187,7 +192,7 @@
def getResource(default_resource)
ret = Ops.get_string(
@ModuleMap,
- [default_resource, "X-SuSE-YaST-AutoInstResource"],
+ [default_resource, RESOURCE_NAME_KEY],
""
)
if ret == ""
@@ -205,7 +210,7 @@
resourceMap = deep_copy(resourceMap)
tmp_resource = Ops.get_string(
resourceMap,
- "X-SuSE-YaST-AutoInstResource",
+ RESOURCE_NAME_KEY,
""
)
resource = tmp_resource if tmp_resource != ""
@@ -335,6 +340,35 @@
true
end
+ # Returns list of all profile sections from the current profile, including
+ # unsupported ones, that do not have any handler (AutoYaST client) assigned
+ # at the current system and are not handled by AutoYaST itself.
+ #
+ # @return [Array<String>] of unknown profile sections
+ def unhandled_profile_sections
+ profile_sections = Profile.current.keys
+
+ profile_handlers = @ModuleMap.map do |name, desc|
+ desc[RESOURCE_NAME_KEY] || name
+ end
+
+ profile_sections.reject! do |section|
+ profile_handlers.include?(section)
+ end
+
+ # Generic sections are handled by AutoYast itself and not mentioned
+ # in any desktop file
+ profile_sections - Yast::ProfileClass::GENERIC_PROFILE_SECTIONS
+ end
+
+ # Returns list of all profile sections from the current profile that are
+ # obsolete, e.g., we do not support them anymore.
+ #
+ # @return [Array<String>] of unsupported profile sections
+ def unsupported_profile_sections
+ unhandled_profile_sections & Yast::ProfileClass::OBSOLETE_PROFILE_SECTIONS
+ end
+
publish :variable => :GroupMap, :type => "map