Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2014-03-21 12:14:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2014-03-11 09:24:26.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2014-03-21 12:14:38.000000000 +0100
@@ -1,0 +2,35 @@
+Wed Mar 19 12:45:27 UTC 2014 - [email protected]
+
+- skip "Installation Options" dialog when online repository option
+ should not be displayed (part of bnc#868942)
+- 3.1.57
+
+-------------------------------------------------------------------
+Fri Mar 14 14:43:06 CET 2014 - [email protected]
+
+- set LIBGL_ALWAYS_INDIRECT in ssh mode (bnc #868175)
+- enable yast theme in ssh mode
+- 3.1.56
+
+-------------------------------------------------------------------
+Fri Mar 14 08:15:01 UTC 2014 - [email protected]
+
+- download on-line version of release notes (fate#314695)
+- 3.1.55
+
+-------------------------------------------------------------------
+Thu Mar 13 09:46:18 UTC 2014 - [email protected]
+
+- add kernel parameters for s390 when cio_ignore enabled to never
+ blacklist console or ipl devices (fate#315318)
+- 3.1.54
+
+-------------------------------------------------------------------
+Wed Mar 12 12:00:40 UTC 2014 - [email protected]
+
+- bnc#858523
+ - dropped disabling network configuration code. yast2-network is
+ in charge of it now.
+- 3.1.53
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.52.tar.bz2
New:
----
yast2-installation-3.1.57.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.AMFJnG/_old 2014-03-21 12:14:41.000000000 +0100
+++ /var/tmp/diff_new_pack.AMFJnG/_new 2014-03-21 12:14:41.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.52
+Version: 3.1.57
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.52.tar.bz2 -> yast2-installation-3.1.57.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/package/yast2-installation.changes
new/yast2-installation-3.1.57/package/yast2-installation.changes
--- old/yast2-installation-3.1.52/package/yast2-installation.changes
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/package/yast2-installation.changes
2014-03-20 08:44:40.000000000 +0100
@@ -1,4 +1,39 @@
-------------------------------------------------------------------
+Wed Mar 19 12:45:27 UTC 2014 - [email protected]
+
+- skip "Installation Options" dialog when online repository option
+ should not be displayed (part of bnc#868942)
+- 3.1.57
+
+-------------------------------------------------------------------
+Fri Mar 14 14:43:06 CET 2014 - [email protected]
+
+- set LIBGL_ALWAYS_INDIRECT in ssh mode (bnc #868175)
+- enable yast theme in ssh mode
+- 3.1.56
+
+-------------------------------------------------------------------
+Fri Mar 14 08:15:01 UTC 2014 - [email protected]
+
+- download on-line version of release notes (fate#314695)
+- 3.1.55
+
+-------------------------------------------------------------------
+Thu Mar 13 09:46:18 UTC 2014 - [email protected]
+
+- add kernel parameters for s390 when cio_ignore enabled to never
+ blacklist console or ipl devices (fate#315318)
+- 3.1.54
+
+-------------------------------------------------------------------
+Wed Mar 12 12:00:40 UTC 2014 - [email protected]
+
+- bnc#858523
+ - dropped disabling network configuration code. yast2-network is
+ in charge of it now.
+- 3.1.53
+
+-------------------------------------------------------------------
Mon Mar 10 13:01:48 UTC 2014 - [email protected]
- don't hide ReleaseNotes button going back fron inst proposal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/package/yast2-installation.spec
new/yast2-installation-3.1.57/package/yast2-installation.spec
--- old/yast2-installation-3.1.52/package/yast2-installation.spec
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/package/yast2-installation.spec
2014-03-20 08:44:40.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.52
+Version: 3.1.57
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/src/clients/inst_download_release_notes.rb
new/yast2-installation-3.1.57/src/clients/inst_download_release_notes.rb
--- old/yast2-installation-3.1.52/src/clients/inst_download_release_notes.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.57/src/clients/inst_download_release_notes.rb
2014-03-20 08:44:40.000000000 +0100
@@ -0,0 +1,129 @@
+# encoding: utf-8
+
+#
------------------------------------------------------------------------------
+# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+#
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail, you may
find
+# current contact information at www.novell.com.
+#
------------------------------------------------------------------------------
+
+#
+# Authors: Jiri Srain <[email protected]>
+#
+# Purpose: Downloads on-line release notes
+#
+# $Id$
+module Yast
+ class InstDownloadReleaseNotesClient < Client
+ Yast.import "UI"
+ Yast.import "Product"
+ Yast.import "Language"
+ Yast.import "Proxy"
+ Yast.import "Directory"
+ Yast.import "InstData"
+
+ include Yast::Logger
+
+ # Download all release notes mentioned in Product::relnotesurl_all
+ #
+ # @return true when successful
+ def download_release_notes
+
+ filename_templ = UI.TextMode ? "/RELEASE-NOTES.%1.txt" :
"/RELEASE-NOTES.%1.rtf"
+
+ # Get proxy settings (if any)
+ proxy = ""
+ # proxy should be set by inst_install_inf if set via Linuxrc
+ Proxy.Read
+ # Test if proxy works
+ if Proxy.enabled
+ #it is enough to test http proxy, release notes are downloaded via http
+ proxy_ret = Proxy.RunTestProxy(
+ Proxy.http,
+ "",
+ "",
+ Proxy.user,
+ Proxy.pass
+ )
+
+ if Ops.get_boolean(proxy_ret, ["HTTP", "tested"], true) == true &&
+ Ops.get_integer(proxy_ret, ["HTTP", "exit"], 1) == 0
+ user_pass = Proxy.user != "" ?
+ Ops.add(Ops.add(Proxy.user, ":"), Proxy.pass) :
+ ""
+ proxy = "--proxy #{Proxy.http}"
+ proxy << " --proxy-user '#{user_pass}'" unless user_pass.empty?
+ end
+ end
+
+ products = Pkg.ResolvableDependencies("", :product, "").select { |
product |
+ product["status"] == :selected || product["status"] == :installed
+ }
+ log.info("Products: #{products}")
+ products.each do | product |
+ url = product["relnotes_url"]
+ log.info("URL: #{url}")
+ # protect from wrong urls
+ if url == nil || url == ""
+ log.warning("Skipping invalid URL")
+ next
+ end
+ pos = url.rindex("/")
+ if pos == nil
+ log.error ("Broken URL for release notes: #{url}")
+ next
+ end
+ url_base = url[0, pos]
+ url_template = url_base + filename_templ
+ log.info("URL template: #{url_base}");
+ [Language.language, Language.language[0..1], "en"].each do | lang |
+ url = Builtins.sformat(url_template, lang)
+ log.info("URL: #{url}");
+ # Where we want to store the downloaded release notes
+ filename = Builtins.sformat("%1/relnotes",
+ SCR.Read(path(".target.tmpdir")))
+ # download release notes now
+ cmd = Builtins.sformat(
+ "/usr/bin/curl --location --verbose --fail --max-time 300 %1 '%2'
--output '%3' > '%4/%5' 2>&1",
+ proxy,
+ url,
+ String.Quote(filename),
+ String.Quote(Directory.logdir),
+ "curl_log"
+ )
+ ret = SCR.Execute(path(".target.bash"), cmd)
+ log.info("Downloading release notes: #{cmd} returned #{ret}")
+ if ret == 0
+ log.info("Release notes downloaded successfully")
+ InstData.release_notes[product["name"]] =
SCR.Read(path(".target.string"), filename)
+ break
+ end
+ end
+ end
+ if ! InstData.release_notes.empty?
+ UI.SetReleaseNotes(InstData.release_notes)
+ Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes")
+ end
+ true
+ end
+
+ def main
+ download_release_notes
+ :auto
+ end
+ end
+end
+
+Yast::InstDownloadReleaseNotesClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/src/clients/inst_installation_options.rb
new/yast2-installation-3.1.57/src/clients/inst_installation_options.rb
--- old/yast2-installation-3.1.52/src/clients/inst_installation_options.rb
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/src/clients/inst_installation_options.rb
2014-03-20 08:44:41.000000000 +0100
@@ -1,7 +1,7 @@
# encoding: utf-8
#
------------------------------------------------------------------------------
-# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+# Copyright (c) 2006-2014 Novell, Inc. All Rights Reserved.
#
#
# This program is free software; you can redistribute it and/or modify it under
@@ -21,7 +21,7 @@
# File: clients/inst_installation_options.rb
# Package: Installation
-# Summary: Initialize installation
+# Summary: Initialize installation, set installation options
# Authors: Jiri Srain <[email protected]>
# Lukas Ocilka <[email protected]>
#
@@ -34,7 +34,6 @@
textdomain "installation"
Yast.import "AddOnProduct"
- Yast.import "GetInstArgs"
Yast.import "Installation"
Yast.import "InstData"
Yast.import "Linuxrc"
@@ -73,24 +72,26 @@
Installation.productsources_selected = false
end
+ # nothing to display, simply continue
+ if !@show_online_repositories
+ SetRequiredPackages()
+ return :auto
+ end
+
Wizard.SetContents(
# dialog caption
_("Installation Options"),
- InstModeDialogContent(:install),
- InstModeDialogHelp(),
+ InstOptionsDialogContent(),
+ InstOptionsDialogHelp(),
true,
true
)
Wizard.SetTitleIcon("yast-software")
- @ret = nil
-
- @umount_result = Linuxrc.InstallInf("umount_result")
- @media = Linuxrc.InstallInf("InstMode")
Builtins.y2milestone(
"Umount result: %1, inst mode: %2",
- @umount_result,
- @media
+ Linuxrc.InstallInf("umount_result"),
+ Linuxrc.InstallInf("InstMode")
)
AdjustStepsAccordingToInstallationSettings()
@@ -106,8 +107,6 @@
Builtins.y2milestone("add_on_selected: %1",
Installation.add_on_selected)
AdjustStepsAccordingToInstallationSettings()
end
- @ret = nil
- next
# Use-Community-Repositories status changed
elsif @ret == :productsources
if UI.WidgetExists(Id(:productsources))
@@ -118,18 +117,11 @@
)
AdjustStepsAccordingToInstallationSettings()
end
- @ret = nil
- next
- # Next button
- elsif @ret == :next
- next
# Abort button
elsif @ret == :abort
if Popup.ConfirmAbort(Stage.initial ? :painless : :incomplete)
return :abort
end
- @ret = nil
- next
end
end until @ret == :back || @ret == :next
@@ -171,11 +163,11 @@
@ret = :finish if @ret == :next
- @ret
+ @ret
end
# see bugzilla #156529
- def InstModeDialogContent(pre_selected)
+ def InstOptionsDialogContent()
HBox(
HStretch(),
VBox(
@@ -204,7 +196,7 @@
)
end
- def InstModeDialogHelp
+ def InstOptionsDialogHelp
# help text for installation method
_("<p><big><b>Installation Options</b></big></p>") +
# help text for installation option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/src/clients/inst_system_analysis.rb
new/yast2-installation-3.1.57/src/clients/inst_system_analysis.rb
--- old/yast2-installation-3.1.52/src/clients/inst_system_analysis.rb
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/src/clients/inst_system_analysis.rb
2014-03-20 08:44:41.000000000 +0100
@@ -348,13 +348,16 @@
else
@packager_initialized = true
Packages.InitializeAddOnProducts
- if load_release_notes(Packages.GetBaseSourceID)
- # push button
- Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes")
- UI::SetReleaseNotes( { Product.name => @media_text } )
+ #try on-line release notes first
+ WFM.CallFunction("inst_download_release_notes")
+ if InstData.release_notes.empty?
+ if load_release_notes(Packages.GetBaseSourceID)
+ # push button
+ Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes")
+ UI::SetReleaseNotes( { Product.name => @media_text } )
+ end
end
-
end
# reregister callbacks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/src/clients/inst_worker_continue.rb
new/yast2-installation-3.1.57/src/clients/inst_worker_continue.rb
--- old/yast2-installation-3.1.52/src/clients/inst_worker_continue.rb
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/src/clients/inst_worker_continue.rb
2014-03-20 08:44:41.000000000 +0100
@@ -80,8 +80,6 @@
AdjustDisabledItems()
- SetNetworkActivationModule()
-
SetDiskActivationModule()
UpdateWizardSteps()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/src/clients/inst_worker_initial.rb
new/yast2-installation-3.1.57/src/clients/inst_worker_initial.rb
--- old/yast2-installation-3.1.52/src/clients/inst_worker_initial.rb
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/src/clients/inst_worker_initial.rb
2014-03-20 08:44:41.000000000 +0100
@@ -78,8 +78,6 @@
# All stages
SetUIContent()
- SetNetworkActivationModule()
-
SetDiskActivationModule()
# Cleanup and other settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/src/include/installation/inst_inc_all.rb
new/yast2-installation-3.1.57/src/include/installation/inst_inc_all.rb
--- old/yast2-installation-3.1.52/src/include/installation/inst_inc_all.rb
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/src/include/installation/inst_inc_all.rb
2014-03-20 08:44:41.000000000 +0100
@@ -234,18 +234,6 @@
nil
end
- def SetNetworkActivationModule
- # update the workflow according to current situation
- # disable lan activation if not needed
-
- if !(Linuxrc.InstallInf("ConfigureNetwork") == "1")
- Builtins.y2milestone("Disabling network activation module")
- ProductControl.DisableModule("lan")
- end
-
- nil
- end
-
def SetDiskActivationModule
# update the workflow according to current situation
# disable disks activation if not needed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.52/src/lib/installation/cio_ignore.rb
new/yast2-installation-3.1.57/src/lib/installation/cio_ignore.rb
--- old/yast2-installation-3.1.52/src/lib/installation/cio_ignore.rb
2014-03-10 15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/src/lib/installation/cio_ignore.rb
2014-03-20 08:44:41.000000000 +0100
@@ -149,9 +149,31 @@
raise "cio_ignore command failed with stderr: #{res["stderr"]}"
end
+ # add kernel parameters that ensure that ipl and console device is
never
+ # blacklisted (fate#315318)
+ add_boot_kernel_parameters
+
nil
else
- raise "Uknown action passed as first parameter"
+ raise "Uknown action #{func} passed as first parameter"
+ end
+ end
+
+ private
+ def add_boot_kernel_parameters
+ Yast.import "Bootloader"
+
+ res = Yast::Bootloader.Read
+
+ # API is not much intuitive, see Yast::Bootloader.setKernelParam for
details
+ res &&= Yast::Bootloader.setKernelParam("DEFAULT", "IPLDEV", "true")
+ res &&= Yast::Bootloader.setKernelParam("DEFAULT", "CONDEV", "true")
+
+
+ res &&= Yast::Bootloader.Write
+
+ if !res
+ raise "failed to write kernel parameters for IPL and console device"
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.52/src/modules/InstData.rb
new/yast2-installation-3.1.57/src/modules/InstData.rb
--- old/yast2-installation-3.1.52/src/modules/InstData.rb 2014-03-10
15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/src/modules/InstData.rb 2014-03-20
08:44:41.000000000 +0100
@@ -93,6 +93,9 @@
# disk to use for OEM image
@image_target_disk = nil
+ # downloaded release notes, product => text
+ @release_notes = {}
+
# EOF
end
@@ -110,6 +113,7 @@
publish :variable => :copy_files_use_control_file, :type => "boolean"
publish :variable => :additional_copy_files, :type => "list <map>"
publish :variable => :image_target_disk, :type => "string"
+ publish :variable => :release_notes, :type => "map<string,string>"
end
InstData = InstDataClass.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.52/startup/YaST2.call
new/yast2-installation-3.1.57/startup/YaST2.call
--- old/yast2-installation-3.1.52/startup/YaST2.call 2014-03-10
15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/startup/YaST2.call 2014-03-20
08:44:42.000000000 +0100
@@ -139,6 +139,8 @@
#
:
export Y2STYLE="installation_slim"
+ export LIBGL_ALWAYS_INDIRECT=1
+ set_inst_qt_env
}
#----[ prepare_for_vnc ]----#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.52/test/cio_ignore_test.rb
new/yast2-installation-3.1.57/test/cio_ignore_test.rb
--- old/yast2-installation-3.1.52/test/cio_ignore_test.rb 2014-03-10
15:25:07.000000000 +0100
+++ new/yast2-installation-3.1.57/test/cio_ignore_test.rb 2014-03-20
08:44:42.000000000 +0100
@@ -105,11 +105,24 @@
end
describe "first parameter \"Write\"" do
+ before(:each) do
+ stub_const("Yast::Bootloader", double())
+
+ allow(Yast::Bootloader).to receive(:Write) { true }
+ allow(Yast::Bootloader).to receive(:Read) { true }
+ allow(Yast::Bootloader).to receive(:setKernelParam) { true }
+
+ allow(Yast::SCR).to receive(:Execute).
+ once.
+ and_return({"exit" => 0, "stdout" => "", "stderr" => ""})
+ end
+
describe "Device blacklisting is disabled" do
it "do nothing" do
::Installation::CIOIgnore.instance.enabled = false
expect(Yast::SCR).to_not receive(:Execute)
+ expect(Yast::Bootloader).to_not receive(:Read)
subject.run("Write")
end
@@ -146,6 +159,27 @@
expect{subject.run("Write")}.to raise_error(RuntimeError, /stderr/)
end
+ it "adds kernel parameters IPLDEV and CONDEV to the bootloader" do
+ expect(Yast::Bootloader).to receive(:Write).once { true }
+ expect(Yast::Bootloader).to receive(:Read).once { true }
+ allow(Yast::Bootloader).to receive(:setKernelParam).once.
+ with("DEFAULT", "IPLDEV", "true").and_return(true)
+ allow(Yast::Bootloader).to receive(:setKernelParam).once.
+ with("DEFAULT", "CONDEV", "true").and_return(true)
+
+ subject.run("Write")
+ end
+
+ it "raises an exception if modifying kernel parameters failed" do
+ expect(Yast::Bootloader).to receive(:Write).never
+ expect(Yast::Bootloader).to receive(:Read).once { true }
+ allow(Yast::Bootloader).to receive(:setKernelParam).once.
+ with("DEFAULT", "IPLDEV", "true").and_return(true)
+ allow(Yast::Bootloader).to receive(:setKernelParam).once.
+ with("DEFAULT", "CONDEV", "true").and_return(false)
+
+ expect{subject.run("Write")}.to raise_error(RuntimeError, /failed to
write kernel parameters/)
+ end
end
end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
