Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at 2015-08-15 11:39:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-13
18:09:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-08-15
11:39:25.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Aug 13 13:19:27 CEST 2015 - sch...@suse.de
+
+- S390: handling cio_ignore
+ Entry <general><cio_ignore> in order to set it
+ (values: true/false). If it is not set cio_ignore is true.
+ So it is backward compatible. (bnc#941406)
+- 3.1.90
+
+-------------------------------------------------------------------
Old:
----
autoyast2-3.1.89.tar.bz2
New:
----
autoyast2-3.1.90.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.J8o9vf/_old 2015-08-15 11:39:26.000000000 +0200
+++ /var/tmp/diff_new_pack.J8o9vf/_new 2015-08-15 11:39:26.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.89
+Version: 3.1.90
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ autoyast2-3.1.89.tar.bz2 -> autoyast2-3.1.90.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.89/package/autoyast2.changes
new/autoyast2-3.1.90/package/autoyast2.changes
--- old/autoyast2-3.1.89/package/autoyast2.changes 2015-08-11
09:54:08.000000000 +0200
+++ new/autoyast2-3.1.90/package/autoyast2.changes 2015-08-14
16:59:08.000000000 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Thu Aug 13 13:19:27 CEST 2015 - sch...@suse.de
+
+- S390: handling cio_ignore
+ Entry <general><cio_ignore> in order to set it
+ (values: true/false). If it is not set cio_ignore is true.
+ So it is backward compatible. (bnc#941406)
+- 3.1.90
+
+-------------------------------------------------------------------
Tue Aug 11 09:33:05 CEST 2015 - sch...@suse.de
- Fixed typo in partitioning section
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.89/package/autoyast2.spec
new/autoyast2-3.1.90/package/autoyast2.spec
--- old/autoyast2-3.1.89/package/autoyast2.spec 2015-08-11 09:54:08.000000000
+0200
+++ new/autoyast2-3.1.90/package/autoyast2.spec 2015-08-14 16:59:08.000000000
+0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.89
+Version: 3.1.90
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.89/src/modules/AutoinstConfig.rb
new/autoyast2-3.1.90/src/modules/AutoinstConfig.rb
--- old/autoyast2-3.1.89/src/modules/AutoinstConfig.rb 2015-08-11
09:54:08.000000000 +0200
+++ new/autoyast2-3.1.90/src/modules/AutoinstConfig.rb 2015-08-14
16:59:08.000000000 +0200
@@ -148,6 +148,11 @@
#
@Confirm = true
+ #
+ # S390
+ #
+ @cio_ignore = true
+
# Running autoyast second_stage
@second_stage = true
@@ -499,6 +504,7 @@
publish :variable => :pass, :type => "string"
publish :variable => :default_target, :type => "string"
publish :variable => :Confirm, :type => "boolean"
+ publish :variable => :cio_ignore, :type => "boolean"
publish :variable => :second_stage, :type => "boolean"
publish :variable => :OriginalURI, :type => "string"
publish :variable => :message, :type => "string"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.89/src/modules/AutoinstGeneral.rb
new/autoyast2-3.1.90/src/modules/AutoinstGeneral.rb
--- old/autoyast2-3.1.89/src/modules/AutoinstGeneral.rb 2015-08-11
09:54:08.000000000 +0200
+++ new/autoyast2-3.1.90/src/modules/AutoinstGeneral.rb 2015-08-14
16:59:08.000000000 +0200
@@ -27,6 +27,7 @@
Yast.import "Storage"
Yast.import "SignatureCheckCallbacks"
Yast.import "Report"
+ Yast.import "Arch"
# All shared data are in yast2.rpm to break cyclic dependencies
Yast.import "AutoinstData"
@@ -55,6 +56,9 @@
@storage = {}
+ # S390
+ @cio_ignore = true
+
# default value of settings modified
@modified = false
AutoinstGeneral()
@@ -175,6 +179,7 @@
SetModified()
Builtins.y2milestone("General import: %1", settings)
@mode = Ops.get_map(settings, "mode", {})
+ @cio_ignore = Ops.get_boolean(settings, "cio_ignore", true)
@signature_handling = Ops.get_map(settings, "signature-handling", {})
@askList = Ops.get_list(settings, "ask-list", [])
@proposals = Ops.get_list(settings, "proposals", [])
@@ -194,6 +199,22 @@
Ops.set(general, "ask-list", @askList)
Ops.set(general, "proposals", @proposals)
Ops.set(general, "storage", @storage)
+
+ if Yast::Arch.s390
+ if Yast::Mode.installation
+ # Taking the selected value (selected by user or AutoYaST)
+ general["cio_ignore"] = @cio_ignore
+ else
+ # Trying to evalute the state from the installed system.
+ # Disabled if there are no active devices defined. (Call
+ # "cio_ignore -L", stored in /boot/zipl/active_devices.txt)
+ active_device_file = File.join(Yast::Installation.destdir,
+ "/boot/zipl/active_devices.txt")
+ general["cio_ignore"] = File.exist?(active_device_file) &&
+ File.stat(active_device_file).size > 0
+ end
+ end
+
deep_copy(general)
end
@@ -411,6 +432,7 @@
# @return [Boolean] true on success
def Write
AutoinstConfig.Confirm = Ops.get_boolean(@mode, "confirm", true)
+ AutoinstConfig.cio_ignore = @cio_ignore
AutoinstConfig.second_stage = @mode["second_stage"] if
@mode.has_key?("second_stage")
if Builtins.haskey(@mode, "forceboot")
ProductFeatures.SetBooleanFeature(
@@ -469,6 +491,7 @@
publish :function => :SetMultipathing, :type => "void ()"
publish :function => :Write, :type => "boolean ()"
publish :function => :AutoinstGeneral, :type => "void ()"
+
end
AutoinstGeneral = AutoinstGeneralClass.new
