Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2014-01-29 07:17:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-23 15:59:03.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2014-01-29 07:17:50.000000000 +0100
@@ -1,0 +2,42 @@
+Tue Jan 28 15:37:15 UTC 2014 - [email protected]
+
+- Fix exporting configuration in first stage (FATE#308539)
+- 3.1.25
+
+-------------------------------------------------------------------
+Mon Jan 27 09:56:26 UTC 2014 - [email protected]
+
+- fate#316768, bnc#854500
+ - enable network service according product feature
+- 3.1.24
+
+-------------------------------------------------------------------
+Fri Jan 24 12:01:29 UTC 2014 - [email protected]
+
+- removed inst_scc.rb client (moved to yast2-registration)
+- 3.1.23
+
+-------------------------------------------------------------------
+Tue Jan 21 14:18:08 UTC 2014 - [email protected]
+
+- Remove icons from system analysis according to Ken's comments
+ (fate#314695)
+- 3.1.22
+
+-------------------------------------------------------------------
+Tue Jan 21 12:15:21 UTC 2014 - [email protected]
+
+- Remove "Change..." button in non-textual installation
+- Add "Export Configuration" button in non-textual installation
+ (FATE#308539)
+- Add "Export Configuration" menu item in textual installation
+ (FATE#308539)
+- 3.1.21
+
+-------------------------------------------------------------------
+Tue Jan 21 08:48:17 UTC 2014 - [email protected]
+
+- adjusted UI according to Ken's comments (fate#314695)
+- 3.1.20
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.19.tar.bz2
New:
----
yast2-installation-3.1.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.Tpg2lv/_old 2014-01-29 07:17:50.000000000 +0100
+++ /var/tmp/diff_new_pack.Tpg2lv/_new 2014-01-29 07:17:50.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.19
+Version: 3.1.25
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.19.tar.bz2 -> yast2-installation-3.1.25.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.19/package/yast2-installation.changes
new/yast2-installation-3.1.25/package/yast2-installation.changes
--- old/yast2-installation-3.1.19/package/yast2-installation.changes
2014-01-20 16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/package/yast2-installation.changes
2014-01-28 17:04:55.000000000 +0100
@@ -1,4 +1,46 @@
-------------------------------------------------------------------
+Tue Jan 28 15:37:15 UTC 2014 - [email protected]
+
+- Fix exporting configuration in first stage (FATE#308539)
+- 3.1.25
+
+-------------------------------------------------------------------
+Mon Jan 27 09:56:26 UTC 2014 - [email protected]
+
+- fate#316768, bnc#854500
+ - enable network service according product feature
+- 3.1.24
+
+-------------------------------------------------------------------
+Fri Jan 24 12:01:29 UTC 2014 - [email protected]
+
+- removed inst_scc.rb client (moved to yast2-registration)
+- 3.1.23
+
+-------------------------------------------------------------------
+Tue Jan 21 14:18:08 UTC 2014 - [email protected]
+
+- Remove icons from system analysis according to Ken's comments
+ (fate#314695)
+- 3.1.22
+
+-------------------------------------------------------------------
+Tue Jan 21 12:15:21 UTC 2014 - [email protected]
+
+- Remove "Change..." button in non-textual installation
+- Add "Export Configuration" button in non-textual installation
+ (FATE#308539)
+- Add "Export Configuration" menu item in textual installation
+ (FATE#308539)
+- 3.1.21
+
+-------------------------------------------------------------------
+Tue Jan 21 08:48:17 UTC 2014 - [email protected]
+
+- adjusted UI according to Ken's comments (fate#314695)
+- 3.1.20
+
+-------------------------------------------------------------------
Mon Jan 13 09:58:46 UTC 2014 - [email protected]
- add clone proposal and finish client (FATE#308539)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.19/package/yast2-installation.spec
new/yast2-installation-3.1.25/package/yast2-installation.spec
--- old/yast2-installation-3.1.19/package/yast2-installation.spec
2014-01-20 16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/package/yast2-installation.spec
2014-01-28 17:04:55.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.19
+Version: 3.1.25
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.19/src/Makefile.am
new/yast2-installation-3.1.25/src/Makefile.am
--- old/yast2-installation-3.1.19/src/Makefile.am 2014-01-20
16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/src/Makefile.am 2014-01-28
17:04:55.000000000 +0100
@@ -47,7 +47,6 @@
clients/inst_restore_settings.rb \
clients/inst_rpmcopy_secondstage.rb \
clients/inst_save_hardware_status.rb \
- clients/inst_scc.rb \
clients/inst_scenarios.rb \
clients/inst_system_analysis.rb \
clients/inst_upgrade_urls.rb \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.19/src/clients/clone_proposal.rb
new/yast2-installation-3.1.25/src/clients/clone_proposal.rb
--- old/yast2-installation-3.1.19/src/clients/clone_proposal.rb 2014-01-20
16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/src/clients/clone_proposal.rb 2014-01-28
17:04:55.000000000 +0100
@@ -16,8 +16,8 @@
Yast.import "Installation"
Yast.import "ProductFeatures"
- func = WFM.Args(0)
- param = WFM.Args(1)
+ func = WFM.Args[0]
+ param = WFM.Args[1] || {}
product_clone_active = ProductFeatures.GetBooleanFeature(
"globals",
@@ -71,7 +71,9 @@
"id" => CLONE_ACTION_ID
}
when "Write"
- WFM.call "clone_system" if @clone_settings.enabled?
+ if param["force"] || @clone_settings.enabled?
+ WFM.call "clone_system"
+ end
ret = true
else
raise "Unsuported action #{func}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.19/src/clients/inst_complex_welcome.rb
new/yast2-installation-3.1.25/src/clients/inst_complex_welcome.rb
--- old/yast2-installation-3.1.19/src/clients/inst_complex_welcome.rb
2014-01-20 16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/src/clients/inst_complex_welcome.rb
2014-01-28 17:04:55.000000000 +0100
@@ -120,21 +120,16 @@
Left(
HSquash(
HBox(
- HSquash(Icon.Simple("yast-language")),
- @text_mode ? Empty() : HSpacing(2),
- Left(@languagesel),
- HSpacing(1),
- HSquash(Icon.Simple("yast-keyboard")),
- @text_mode ? Empty() : HSpacing(2),
- Left(@keyboardsel),
- HSpacing(10)
+ HWeight(1, Left(@languagesel)),
+ HSpacing(3),
+ HWeight(1, Left(@keyboardsel))
)
)
),
VSpacing(1),
VWeight(1, VStretch()),
VWeight(
- 20,
+ 30,
Left(
HSquash(
VBox(
@@ -229,8 +224,6 @@
UI.ChangeWidget(Id(:keyboard), :Value, @kbd)
end
- Wizard.SetTitleIcon("suse")
-
# Get the user input.
#
@ret = nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.19/src/clients/inst_proposal.rb
new/yast2-installation-3.1.25/src/clients/inst_proposal.rb
--- old/yast2-installation-3.1.19/src/clients/inst_proposal.rb 2014-01-20
16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/src/clients/inst_proposal.rb 2014-01-28
17:04:55.000000000 +0100
@@ -50,6 +50,7 @@
Yast.import "Popup"
Yast.import "Language"
Yast.import "GetInstArgs"
+ Yast.import "String"
Yast.include self, "installation/misc.rb"
@@ -175,9 +176,8 @@
get_submod_descriptions_and_build_menu
end
- # check for hyperlink id
-
- if Ops.is_string?(@input)
+ case @input
+ when ::String #hyperlink
# get module for hyperlink id
@submod = Ops.get_string(@id2submod, @input, "")
@@ -200,25 +200,35 @@
# so we have to do this special case here. Kind of broken.
return :finish if @input == :finish
end
- elsif @input == "rel_notes"
- WFM.CallFunction("release_notes_popup", [])
- elsif @input == :finish
+ when :finish
return :finish
- elsif @input == :abort
+ when :abort
if Stage.initial
return :abort if Popup.ConfirmAbort(:painless)
else
return :abort if Popup.ConfirmAbort(:incomplete)
end
- elsif @input == :reset_to_defaults &&
- Popup.ContinueCancel(
+ when :reset_to_defaults
+ next unless Popup.ContinueCancel(
# question in a popup box
_("Really reset everything to default values?") + "\n" +
# explain consequences of a decision
_("You will lose all changes.")
)
make_proposal(true, false) # force_reset
- elsif @input == :skip || @input == :dontskip
+ when :export_config
+ path = UI.AskForSaveFileName("/", "*.xml", _("Location of Stored
Configuration"))
+ next unless path
+
+ # force write, so it always write profile even if user do not want
+ # to store profile after installation
+ WFM.CallFunction("clone_proposal", ["Write", "force" => true])
+ if !File.exists?("/root/autoinst.xml")
+ raise _("Failed to store configuration. Details can be found in
log.")
+ end
+
+ WFM.Execute(path(".local.bash"), "mv -- /root/autoinst.xml
'#{String.Quote(path)}'")
+ when :skip, :dontskip
if Convert.to_boolean(UI.QueryWidget(Id(:skip), :Value))
# User doesn't want to use any of the settings
UI.ChangeWidget(
@@ -236,7 +246,7 @@
make_proposal(false, false)
UI.ChangeWidget(Id(:menu), :Enabled, true)
end
- elsif @input == :next
+ when :next
@skip = UI.WidgetExists(Id(:skip)) ?
Convert.to_boolean(UI.QueryWidget(Id(:skip), :Value)) :
true
@@ -270,18 +280,13 @@
Wizard.HideReleaseNotesButton
return :next
end
- elsif @input == :back
+ when :back
Wizard.HideReleaseNotesButton
Wizard.SetNextButton(:next, Label.NextButton) if Stage.initial
return :back
end
end # while input loop
-
- # NOTREACHED
-
- # EOF
-
nil
end
@@ -984,15 +989,25 @@
)
)
+ if UI.TextMode()
+ change_point = ReplacePoint(
+ Id(:rep_menu),
+ # menu button
+ MenuButton(Id(:menu_dummy), _("&Change..."), [Item(Id(:dummy),
"")])
+ )
+ else
+ change_point = PushButton(
+ Id(:export_config),
+ # menu button
+ _("&Export Configuration")
+ )
+ end
+
# change menu
menu_box = VBox(
HBox(
HStretch(),
- ReplacePoint(
- Id(:rep_menu),
- # menu button
- MenuButton(Id(:menu_dummy), _("&Change..."), [Item(Id(:dummy),
"")])
- ),
+ change_point,
HStretch()
),
ReplacePoint(Id("inst_proposal_progress"), Empty())
@@ -1054,9 +1069,15 @@
# May contain newlines, but don't make it very much longer than the
original.
Left(
Label(
- _(
- "Click a headline to make changes or use the \"Change...\"
menu below."
- )
+ if UI.TextMode()
+ _(
+ "Click a headline to make changes or use the \"Change...\"
menu below."
+ )
+ else
+ _(
+ "Click a headline to make changes."
+ )
+ end
)
),
rt,
@@ -1084,6 +1105,7 @@
nil
end
+
def get_submod_descriptions_and_build_menu
menu_list = []
new_submodules = []
@@ -1091,34 +1113,29 @@
@titles = []
descriptions = {}
- Builtins.foreach(@submodules) do |submod|
+ @submodules.each do |submod|
description = submod_description(submod)
- if description == nil
+ if description.nil?
Builtins.y2milestone(
"Submodule %1 not available (not installed?)",
submod
)
else
if description != {}
- Ops.set(description, "no", no)
- Ops.set(descriptions, submod, description)
- new_submodules = Builtins.add(new_submodules, submod)
- title = Ops.get_string(
- description,
- "rich_text_title",
- Ops.get_string(description, "rich_text_raw_title", submod)
- )
- id = Ops.get_string(
- description,
- "id",
- Builtins.sformat("module_%1", no)
- )
+ description["no"] = no
+ descriptions[submod] = description
+ new_submodules << submod
+ title = description["rich_text_title"] ||
+ description["rich_text_raw_title"] ||
+ submod
+
+ id = description["id"] || Builtins.sformat("module_%1", no)
+
+ @titles << title
+ @submod2id[submod] = id
+ @id2submod[id] = submod
- @titles = Builtins.add(@titles, title)
- Ops.set(@submod2id, submod, id)
- Ops.set(@id2submod, id, submod)
-
- no = Ops.add(no, 1)
+ no += 1
end
end
end
@@ -1126,52 +1143,47 @@
@submodules = deep_copy(new_submodules) # maybe some submodules are not
installed
Builtins.y2milestone("Execution order after rewrite: %1", @submodules)
- # now build the menu button
- Builtins.foreach(@submodules_presentation) do |submod|
- descr = Ops.get_map(descriptions, submod, {})
- if descr != {}
- no2 = Ops.get_integer(descr, "no", 0)
- id = Ops.get_string(descr, "id", Builtins.sformat("module_%1", no2))
- if Builtins.haskey(descr, "menu_titles")
- Builtins.foreach(Ops.get_list(descr, "menu_titles", [])) do |i|
- id2 = Ops.get(i, "id", "")
- title = Ops.get(i, "title", "")
- if id2 != "" && title != ""
- menu_list = Builtins.add(
- menu_list,
- Item(Id(id2), Ops.add(title, "..."))
- )
+ if UI.TextMode
+ # now build the menu button
+ Builtins.foreach(@submodules_presentation) do |submod|
+ descr = descriptions[submod] || {}
+ next if descr.empty?
+
+ no2 = descr["no"] || 0
+ id = descr["id"] || Builtins.sformat("module_%1", no2)
+ if descr.has_key? "menu_titles"
+ descr["menu_titles"].each do |i|
+ id2 = i["id"]
+ title = i["title"]
+ if id2 && title
+ menu_list << Item(Id(id2), Ops.add(title, "..."))
else
Builtins.y2error("Invalid menu item: %1", i)
end
end
else
- menu_title = Ops.get_string(
- descr,
- "menu_title",
- Ops.get_string(descr, "rich_text_title", submod)
- )
- menu_list = Builtins.add(
- menu_list,
- Item(Id(id), Ops.add(menu_title, "..."))
- )
+ menu_title = descr["menu_title"] ||
+ descr["rich_text_title"] ||
+ submod
+
+ menu_list << Item(Id(id), Ops.add(menu_title, "..."))
end
end
- end
- # menu button item
- menu_list = Builtins.add(
- menu_list,
- Item(Id(:reset_to_defaults), _("&Reset to defaults"))
- )
- # menu button
- UI.ReplaceWidget(
- Id(:rep_menu),
- MenuButton(Id(:menu), _("&Change..."), menu_list)
- )
+ # menu button item
+ menu_list << Item(Id(:reset_to_defaults), _("&Reset to defaults")) <<
+ Item(Id(:export_config), _("&Export Configuration"))
+
+ # menu button
+ UI.ReplaceWidget(
+ Id(:rep_menu),
+ MenuButton(Id(:menu), _("&Change..."), menu_list)
+ )
+ end
- Ops.greater_than(no, 1)
+ return no > 1
end
+
def set_icon
icon = "yast-software"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.19/src/clients/inst_scc.rb
new/yast2-installation-3.1.25/src/clients/inst_scc.rb
--- old/yast2-installation-3.1.19/src/clients/inst_scc.rb 2014-01-20
16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/src/clients/inst_scc.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,109 +0,0 @@
-# encoding: utf-8
-
-#
------------------------------------------------------------------------------
-# Copyright (c) 2013 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.
-#
------------------------------------------------------------------------------
-#
-# Summary: Ask user for the SCC credentials
-#
-
-module Yast
- class InstSccClient < Client
- def main
- Yast.import "UI"
-
- textdomain "installation"
-
- Yast.import "Popup"
- Yast.import "GetInstArgs"
- Yast.import "Wizard"
- Yast.import "Report"
-
- @test_mode = WFM.Args.include?("test")
-
- Wizard.CreateDialog if @test_mode
-
- show_scc_credentials_dialog
-
- ret = nil
- email = nil
- reg_code = nil
-
- continue_buttons = [:next, :back, :close, :abort]
- while !continue_buttons.include?(ret) do
- ret = UI.UserInput
-
- if ret == :next
- email = UI.QueryWidget(Id(:email), :Value)
- reg_code = UI.QueryWidget(Id(:reg_code), :Value)
-
- # TODO: validate the email and the reg_key ?? How to skip
registration then?
- #if email.empty?
- # Popup.Error(_("The email address cannot be empty."))
- # ret = nil
- #end
- end
- end
-
- if ret == :next && email && reg_code
- Popup.ShowFeedback(_("Sending Data"), _("Contacting the SUSE Customer
Center server..."))
-
- # TODO: connect to the SCC server here
- sleep(7)
-
- Popup.ClearFeedback
- end
-
- Wizard.CloseDialog if @test_mode
-
- return ret
- end
-
-
- private
-
- def scc_credentials_dialog
- Frame(_("SUSE Customer Center Credentials"),
- MarginBox(1, 0.5,
- VBox(
- InputField(Id(:email), _("&Email")),
- VSpacing(0.5),
- InputField(Id(:reg_code), _("Registration &Code"))
- )
- )
- )
- end
-
- def scc_help_text
- # TODO: improve the help text
- _("Enter SUSE Customer Center credentials here to register the system to
get updates and add-on products.")
- end
-
- def show_scc_credentials_dialog
- Wizard.SetContents(
- _("SUSE Customer Center Registration"),
- scc_credentials_dialog,
- scc_help_text,
- GetInstArgs.enable_back || @test_mode,
- GetInstArgs.enable_next || @test_mode
- )
- end
- end
-end
-
-Yast::InstSccClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.19/src/clients/inst_system_analysis.rb
new/yast2-installation-3.1.25/src/clients/inst_system_analysis.rb
--- old/yast2-installation-3.1.19/src/clients/inst_system_analysis.rb
2014-01-20 16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/src/clients/inst_system_analysis.rb
2014-01-28 17:04:55.000000000 +0100
@@ -91,7 +91,6 @@
@actions_todo = []
@actions_doing = []
@actions_functions = []
- @visible_icons = []
Builtins.y2milestone("Probing done: %1", Installation.probing_done)
if !Installation.probing_done
@@ -107,10 +106,6 @@
@actions_functions,
fun_ref(method(:ActionUSB), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-usb.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -126,10 +121,6 @@
@actions_functions,
fun_ref(method(:ActionFireWire), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-firewire.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -145,10 +136,6 @@
@actions_functions,
fun_ref(method(:ActionFloppyDisks), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-floppy.png"
- )
end
# TRANSLATORS: progress step
@@ -165,10 +152,6 @@
@actions_functions,
fun_ref(method(:ActionHHDControllers), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-hdd-controller.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -184,10 +167,6 @@
@actions_functions,
fun_ref(method(:ActionLoadModules), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-hdd-controller-kernel-module.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(@actions_todo, _("Probe hard disks"))
@@ -200,7 +179,6 @@
@actions_functions,
fun_ref(method(:ActionHDDProbe), "boolean ()")
)
- @visible_icons = Builtins.add(@visible_icons,
"32x32/apps/yast-hdd.png")
WFM.CallFunction("inst_features", [])
end
@@ -219,10 +197,6 @@
@actions_functions,
fun_ref(method(:SearchForLinuxPartitions), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-search-linux-partition.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(@actions_todo, _("Search for system files"))
@@ -236,10 +210,6 @@
@actions_functions,
fun_ref(method(:FilesFromOlderSystems), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-system-files.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -255,10 +225,6 @@
@actions_functions,
fun_ref(method(:EvaluateUpdatePossibilities), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-update-possibility.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -274,12 +240,8 @@
@actions_functions,
fun_ref(method(:InitInstallationRepositories), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-package-manager.png"
- )
- Progress.NewProgressIcons(
+ Progress.New(
# TRANSLATORS: dialog caption
_("System Probing"),
" ",
@@ -287,8 +249,7 @@
@actions_todo,
@actions_doing,
# TRANSLATORS: dialog help
- _("YaST is probing computer hardware and installed systems now."),
- [@visible_icons]
+ _("YaST is probing computer hardware and installed systems now.")
)
Builtins.foreach(@actions_functions) do |run_function|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.19/src/clients/network_finish.rb
new/yast2-installation-3.1.25/src/clients/network_finish.rb
--- old/yast2-installation-3.1.19/src/clients/network_finish.rb 2014-01-20
16:55:14.000000000 +0100
+++ new/yast2-installation-3.1.25/src/clients/network_finish.rb 2014-01-28
17:04:55.000000000 +0100
@@ -42,6 +42,7 @@
Yast.import "Linuxrc"
Yast.import "String"
Yast.import "NetworkService"
+ Yast.import "Lan"
@ret = nil
@func = ""
@@ -69,6 +70,15 @@
"when" => [:installation, :update, :autoinst]
}
elsif @func == "Write"
+
+ if Lan.UseNetworkManager
+ NetworkService.use_network_manager
+ else
+ NetworkService.use_wicked
+ end
+
+ NetworkService.EnableDisableNow
+
# if network running, write network configuration
# also in case of IPv6 (bnc#477917)
if NetworkService.isNetworkRunning || NetworkService.isNetworkv6Running
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
