Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-11-20 11:29:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2013-11-18 10:54:58.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-11-20 11:29:55.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Nov 19 10:19:13 CET 2013 - [email protected]
+
+- Proposing separate /home partition on SLES and SLES for VMware
+ (FATE#316624)
+
+-------------------------------------------------------------------
+Mon Nov 18 13:28:32 UTC 2013 - [email protected]
+
+- move some steps from removed 2nd stage to the 1st stage
+- "inst_mode" client: removed installation/update switch,
+ renamed to "inst_installation_options"
+- 3.1.6
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.5.tar.bz2
New:
----
yast2-installation-3.1.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.EgybwW/_old 2013-11-20 11:29:56.000000000 +0100
+++ /var/tmp/diff_new_pack.EgybwW/_new 2013-11-20 11:29:56.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.5
+Version: 3.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.5.tar.bz2 -> yast2-installation-3.1.6.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.5/VERSION
new/yast2-installation-3.1.6/VERSION
--- old/yast2-installation-3.1.5/VERSION 2013-11-15 15:50:13.000000000
+0100
+++ new/yast2-installation-3.1.6/VERSION 2013-11-19 13:46:10.000000000
+0100
@@ -1 +1 @@
-3.1.5
+3.1.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.5/control/control.SLED.xml
new/yast2-installation-3.1.6/control/control.SLED.xml
--- old/yast2-installation-3.1.5/control/control.SLED.xml 2013-11-15
15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/control/control.SLED.xml 2013-11-19
13:46:10.000000000 +0100
@@ -510,9 +510,7 @@
</module>
<module>
<label>System Analysis</label>
- <name>mode</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
+ <name>installation_options</name>
</module>
<module>
<label>Add-On Products</label>
@@ -562,6 +560,18 @@
</module>
<module>
<label>Perform Installation</label>
+ <name>addon_update_sources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>extrasources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>save_hardware_status</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
<name>finish</name>
<enable_back>no</enable_back>
</module>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.5/control/control.SLES-for-VMware.xml
new/yast2-installation-3.1.6/control/control.SLES-for-VMware.xml
--- old/yast2-installation-3.1.5/control/control.SLES-for-VMware.xml
2013-11-15 15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/control/control.SLES-for-VMware.xml
2013-11-19 13:46:10.000000000 +0100
@@ -237,7 +237,7 @@
</software>
<partitioning>
- <try_separate_home config:type="boolean">false</try_separate_home>
+ <try_separate_home config:type="boolean">true</try_separate_home>
<limit_try_home>5GB</limit_try_home>
<root_space_percent>40</root_space_percent>
<root_base_size>3GB</root_base_size>
@@ -716,9 +716,7 @@
</module>
<module>
<label>System Analysis</label>
- <name>mode</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
+ <name>installation_options</name>
</module>
<module>
<label>Add-On Products</label>
@@ -776,6 +774,18 @@
</module>
<module>
<label>Perform Installation</label>
+ <name>addon_update_sources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>extrasources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>save_hardware_status</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
<name>finish</name>
</module>
</modules>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.5/control/control.SLES.xml
new/yast2-installation-3.1.6/control/control.SLES.xml
--- old/yast2-installation-3.1.5/control/control.SLES.xml 2013-11-15
15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/control/control.SLES.xml 2013-11-19
13:46:10.000000000 +0100
@@ -260,7 +260,7 @@
</software>
<partitioning>
- <try_separate_home config:type="boolean">false</try_separate_home>
+ <try_separate_home config:type="boolean">true</try_separate_home>
<limit_try_home>5GB</limit_try_home>
<root_space_percent>40</root_space_percent>
<root_base_size>3GB</root_base_size>
@@ -741,9 +741,7 @@
</module>
<module>
<label>System Analysis</label>
- <name>mode</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
+ <name>installation_options</name>
</module>
<module>
<label>Add-On Products</label>
@@ -801,6 +799,18 @@
</module>
<module>
<label>Perform Installation</label>
+ <name>addon_update_sources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>extrasources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>save_hardware_status</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
<name>finish</name>
</module>
</modules>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.5/control/control.openSUSE.xml
new/yast2-installation-3.1.6/control/control.openSUSE.xml
--- old/yast2-installation-3.1.5/control/control.openSUSE.xml 2013-11-15
15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/control/control.openSUSE.xml 2013-11-19
13:46:10.000000000 +0100
@@ -569,6 +569,10 @@
<label>System Analysis</label>
<name>system_analysis</name>
</module>
+ <module>
+ <label>System Analysis</label>
+ <name>installation_options</name>
+ </module>
<module>
<label>Disk</label>
<name>disk_proposal</name>
@@ -656,6 +660,18 @@
</module>
<module>
<label>Perform Installation</label>
+ <name>addon_update_sources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>extrasources</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>save_hardware_status</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
<name>finish</name>
<enable_back>no</enable_back>
</module>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.5/package/yast2-installation.changes
new/yast2-installation-3.1.6/package/yast2-installation.changes
--- old/yast2-installation-3.1.5/package/yast2-installation.changes
2013-11-15 15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/package/yast2-installation.changes
2013-11-19 13:46:10.000000000 +0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Tue Nov 19 10:19:13 CET 2013 - [email protected]
+
+- Proposing separate /home partition on SLES and SLES for VMware
+ (FATE#316624)
+
+-------------------------------------------------------------------
+Mon Nov 18 13:28:32 UTC 2013 - [email protected]
+
+- move some steps from removed 2nd stage to the 1st stage
+- "inst_mode" client: removed installation/update switch,
+ renamed to "inst_installation_options"
+- 3.1.6
+
+-------------------------------------------------------------------
Tue Nov 12 09:24:25 UTC 2013 - [email protected]
- control file cleanup:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.5/package/yast2-installation.spec
new/yast2-installation-3.1.6/package/yast2-installation.spec
--- old/yast2-installation-3.1.5/package/yast2-installation.spec
2013-11-15 15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/package/yast2-installation.spec
2013-11-19 13:46:10.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.5
+Version: 3.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.5/src/Makefile.am
new/yast2-installation-3.1.6/src/Makefile.am
--- old/yast2-installation-3.1.5/src/Makefile.am 2013-11-15
15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/src/Makefile.am 2013-11-19
13:46:10.000000000 +0100
@@ -70,7 +70,7 @@
clients/inst_deploy_image.rb \
clients/ldconfig_finish.rb \
clients/inst_complex_welcome.rb \
- clients/inst_mode.rb
+ clients/inst_installation_options.rb
yncludedir = @yncludedir@/installation
ynclude_DATA = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.5/src/clients/inst_installation_options.rb
new/yast2-installation-3.1.6/src/clients/inst_installation_options.rb
--- old/yast2-installation-3.1.5/src/clients/inst_installation_options.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.6/src/clients/inst_installation_options.rb
2013-11-19 13:46:10.000000000 +0100
@@ -0,0 +1,235 @@
+# 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.
+#
------------------------------------------------------------------------------
+
+# File: clients/inst_installation_options.rb
+# Package: Installation
+# Summary: Initialize installation
+# Authors: Jiri Srain <[email protected]>
+# Lukas Ocilka <[email protected]>
+#
+#
+module Yast
+ class InstModeClient < Client
+ def main
+ Yast.import "UI"
+
+ textdomain "installation"
+
+ Yast.import "AddOnProduct"
+ Yast.import "GetInstArgs"
+ Yast.import "Installation"
+ Yast.import "InstData"
+ Yast.import "Linuxrc"
+ Yast.import "Mode"
+ Yast.import "PackageCallbacks"
+ Yast.import "Popup"
+ Yast.import "ProductControl"
+ Yast.import "Stage"
+ Yast.import "Wizard"
+ Yast.import "ProductFeatures"
+ Yast.import "PackagesProposal"
+
+ Yast.include self, "packager/storage_include.rb"
+ Yast.include self, "installation/misc.rb"
+
+ InstData.start_mode = Mode.mode
+
+ # always check whether user wants to continue
+ AddOnProduct.skip_add_ons = false
+
+ # bugzilla #208222
+ # Release disk used as the installation source
+ ReleaseHDDUsedAsInstallationSource()
+
+ if Mode.autoinst
+ Builtins.y2milestone("Autoinst -> returning `auto")
+ return :auto
+ end
+
+ @show_online_repositories = ProductFeatures.GetBooleanFeature(
+ "globals",
+ "show_online_repositories"
+ )
+ # if not visible, internally disabled as well
+ if @show_online_repositories != true
+ Installation.productsources_selected = false
+ end
+
+ Wizard.SetContents(
+ # dialog caption
+ _("Installation Options"),
+ InstModeDialogContent(:install),
+ InstModeDialogHelp(),
+ 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
+ )
+
+ AdjustStepsAccordingToInstallationSettings()
+
+ begin
+ @ret = UI.UserInput
+ Builtins.y2milestone("ret: %1", @ret)
+
+ # Use-Add-On-Product status changed
+ if @ret == :add_on
+ if UI.WidgetExists(Id(:add_on))
+ Installation.add_on_selected = UI.QueryWidget(Id(:add_on), :Value)
+ 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))
+ Installation.productsources_selected =
UI.QueryWidget(Id(:productsources), :Value)
+ Builtins.y2milestone(
+ "productsources_selected: %1",
+ Installation.productsources_selected
+ )
+ 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
+
+ # <-- Handling User Input in Installation Mode
+
+ if @ret == :next
+ Builtins.y2milestone(
+ "Disabled modules: %1",
+ ProductControl.GetDisabledModules
+ )
+ elsif @ret == :back || @ret == :finish
+ Builtins.y2milestone("Returning: %1", @ret)
+ return @ret
+ end
+
+ # bugzilla #293808
+ # Check (and setup) the network only when needed
+ if Installation.add_on_selected || Installation.productsources_selected
+ # Check and setup network
+ @inc_ret = Convert.to_symbol(WFM.CallFunction("inst_network_check",
[]))
+ Builtins.y2milestone("inst_network_check ret: %1", @inc_ret)
+ return @inc_ret if [:back, :abort].include?(@inc_ret)
+ end
+
+ # bug #302384
+ Wizard.SetContents(
+ _("Initializing"),
+ # TRANSLATORS: progress message
+ Label(_("Initializing...")),
+ "",
+ false,
+ false
+ )
+ Wizard.SetTitleIcon("yast-software")
+
+ UpdateWizardSteps()
+ SetRequiredPackages()
+ @ret = ProductControl.RunFrom(ProductControl.CurrentStep + 1, false)
+
+ @ret = :finish if @ret == :next
+
+ @ret
+ end
+
+ # see bugzilla #156529
+ def InstModeDialogContent(pre_selected)
+ HBox(
+ HStretch(),
+ VBox(
+ @show_online_repositories == true ?
+ Left(
+ CheckBox(
+ Id(:productsources),
+ Opt(:notify),
+ # check box
+ _("&Add Online Repositories Before Installation"),
+ Installation.productsources_selected
+ )
+ ) :
+ Empty(),
+ Left(
+ CheckBox(
+ Id(:add_on),
+ Opt(:notify),
+ # check box
+ _("In&clude Add-on Products from Separate Media"),
+ Installation.add_on_selected
+ )
+ )
+ ),
+ HStretch()
+ )
+ end
+
+ def InstModeDialogHelp
+ # help text for installation method
+ _("<p><big><b>Installation Options</b></big></p>") +
+ # help text for installation option
+ (@show_online_repositories == true ?
+ _("<p>\nTo use suggested remote repositories during installation or
update, select\n" +
+ "<b>Add Online Repositories Before Installation</b>.</p>") :
+ "") +
+ # help text for installation method
+ _("<p>\nTo install an add-on product from separate media together with
&product;, select\n" +
+ "<b>Include Add-on Products from Separate Media</b>.</p>\n") +
+ # help text: additional help for installation
+ _("<p>If you need specific hardware drivers for installation, see
<i>http://drivers.suse.com</i> site.</p>")
+ end
+
+ def SetRequiredPackages
+ Builtins.y2milestone(
+ "Adding packages required for installation to succeed..."
+ )
+ PackagesProposal.AddResolvables(
+ "YaST-Installation",
+ :package,
+ ["perl-Bootloader-YAML"]
+ )
+ end
+ end
+end
+
+Yast::InstModeClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.5/src/clients/inst_mode.rb
new/yast2-installation-3.1.6/src/clients/inst_mode.rb
--- old/yast2-installation-3.1.5/src/clients/inst_mode.rb 2013-11-15
15:50:13.000000000 +0100
+++ new/yast2-installation-3.1.6/src/clients/inst_mode.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,461 +0,0 @@
-# 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.
-#
------------------------------------------------------------------------------
-
-# File: clients/inst_system_analysis.ycp
-# Package: Installation
-# Summary: Installation mode selection, system analysis
-# Authors: Jiri Srain <[email protected]>
-# Lukas Ocilka <[email protected]>
-#
-# $Id$
-#
-module Yast
- class InstModeClient < Client
- def main
- Yast.import "Pkg"
- Yast.import "UI"
-
- textdomain "installation"
-
- Yast.import "AddOnProduct"
- Yast.import "GetInstArgs"
- Yast.import "Installation"
- Yast.import "InstData"
- Yast.import "Kernel"
- Yast.import "Linuxrc"
- Yast.import "Mode"
- Yast.import "PackageCallbacks"
- Yast.import "Packages"
- Yast.import "Popup"
- Yast.import "ProductControl"
- Yast.import "Report"
- Yast.import "Stage"
- Yast.import "Storage"
- Yast.import "Wizard"
- Yast.import "ProductFeatures"
- Yast.import "Directory"
- Yast.import "PackagesProposal"
- Yast.import "InstError"
-
- Yast.include self, "packager/storage_include.rb"
- Yast.include self, "installation/misc.rb"
-
- InstData.start_mode = Mode.mode
-
- # always check whether user wants to continue
- AddOnProduct.skip_add_ons = false
-
- @display_info = UI.GetDisplayInfo
- @in_textmode = Ops.get_boolean(@display_info, "TextMode", false)
-
- Wizard.SetTitleIcon("yast-inst-mode")
-
- # In case of going back from Update/New Installation
- Pkg.TargetFinish if GetInstArgs.going_back
-
- @other_options_enabled = InstData.have_linux && InstData.offer_update
-
- # bugzilla #208222
- # Release disk used as the installation source
- ReleaseHDDUsedAsInstallationSource()
-
- if Mode.autoinst
- Builtins.y2milestone("Autoinst -> returning `auto")
- return :auto
- end
-
- @show_online_repositories = ProductFeatures.GetBooleanFeature(
- "globals",
- "show_online_repositories"
- )
- # if not visible, internally disabled as well
- if @show_online_repositories != true
- Installation.productsources_selected = false
- end
-
- Wizard.SetContents(
- # dialog caption
- _("Installation Mode"),
- InstModeDialogContent(:install),
- InstModeDialogHelp(),
- true,
- true
- )
- Wizard.SetTitleIcon("yast-software")
-
- @ret = nil
- @new_mode = Mode.update ? :update : :install
-
- @umount_result = Linuxrc.InstallInf("umount_result")
- @media = Linuxrc.InstallInf("InstMode")
- Builtins.y2milestone(
- "Umount result: %1, inst mode: %2",
- @umount_result,
- @media
- )
-
- # only installation (and addon products) enabled
- if @other_options_enabled != true
- UI.ChangeWidget(Id(:update), :Enabled, false)
-
- # disable also icons related to options if supported by UI
- Builtins.foreach([:update]) do |image_id|
- icon_id = GenerateIconID(image_id)
- if UI.WidgetExists(Id(icon_id))
- UI.ChangeWidget(Id(icon_id), :Enabled, false)
- end
- end if !@in_textmode
- end
-
- Builtins.y2milestone("Initial Mode: #{Mode.mode}")
- AdjustStepsAccordingToInstallationSettings()
- begin
- @ret = Convert.to_symbol(UI.UserInput)
- Builtins.y2milestone("ret: %1", @ret)
-
- # Use-Add-On-Product status changed
- if @ret == :add_on
- if UI.WidgetExists(Id(:add_on))
- Installation.add_on_selected = Convert.to_boolean(
- UI.QueryWidget(Id(:add_on), :Value)
- )
- 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))
- Installation.productsources_selected = Convert.to_boolean(
- UI.QueryWidget(Id(:productsources), :Value)
- )
- Builtins.y2milestone(
- "productsources_selected: %1",
- Installation.productsources_selected
- )
- AdjustStepsAccordingToInstallationSettings()
- end
- @ret = nil
- next
- # Adjusting current UI - Hide Other Options
- # in case of `install, `update, or `repair clicked
- elsif Builtins.contains([:install, :update], @ret)
- @selected_mode = Convert.to_symbol(
- UI.QueryWidget(Id(:inst_mode), :CurrentButton)
- )
-
- # [(any) `check_box_id, (boolean) selected, (boolean) enabled]
- Builtins.foreach(
- [
- [:add_on, Installation.add_on_selected, @ret != :repair],
- [
- :productsources,
- Installation.productsources_selected,
- @show_online_repositories && @ret != :repair
- ]
- ]
- ) do |one_item|
- if UI.WidgetExists(Id(one_item.first))
- UI.ChangeWidget(Id(one_item.first), :Enabled, one_item[2])
- UI.ChangeWidget(Id(one_item.first), :Value, one_item[1])
- end
- end
-
- # Switch the mode and steps ASAP
- if @selected_mode == :install
- Mode.SetMode("installation")
- elsif @selected_mode == :update
- Mode.SetMode("update")
- end
-
- Builtins.y2milestone("New mode has been selected: %1", Mode.mode)
- AdjustStepsAccordingToInstallationSettings()
-
- next
-
- # Next button
- elsif @ret == :next
- @new_mode = Convert.to_symbol(
- UI.QueryWidget(Id(:inst_mode), :CurrentButton)
- )
- if @new_mode == nil
- # this is a label of a message box
- Popup.Message(_("Choose one of the\noptions to continue."))
- @ret = nil
- next
- end
-
- 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
-
- # <-- Handling User Input in Installation Mode
-
- Builtins.y2milestone("Selected mode: %1, Return: %2", @new_mode, @ret)
-
- if @ret == :next
- Builtins.y2milestone(
- "Disabled modules: %1",
- ProductControl.GetDisabledModules
- )
- elsif @ret == :back || @ret == :finish
- Builtins.y2milestone("Returning: %1", @ret)
- return @ret
- end
-
- # bugzilla #293808
- # Check (and setup) the network only when needed
- if @new_mode != :repair &&
- (Installation.add_on_selected ||
Installation.productsources_selected)
- # Check and setup network
- @inc_ret = Convert.to_symbol(WFM.CallFunction("inst_network_check",
[]))
- Builtins.y2milestone("inst_network_check ret: %1", @inc_ret)
- return @inc_ret if Builtins.contains([:back, :abort], @inc_ret)
- end
-
- # bug #302384
- Wizard.SetContents(
- _("Initializing"),
- # TRANSLATORS: progress message
- Label(_("Initializing...")),
- "",
- false,
- false
- )
- Wizard.SetTitleIcon("yast-software")
-
- if Mode.mode != InstData.start_mode
- Builtins.y2milestone(
- "Switching Steps from %1 to %2 ",
- InstData.start_mode,
- Mode.mode
- )
- UpdateWizardSteps()
- Builtins.y2milestone("Resetting disk target to read values")
- Storage.ResetOndiskTarget
- Builtins.y2debug(
- "Original target map (from disk): %1",
- Storage.GetTargetMap
- )
- Builtins.y2milestone("Resetting package manager")
- Kernel.ProbeKernel
- Pkg.TargetFinish
- Pkg.PkgReset
- # Resets all resolvables required by installation/update parts
- # Particular modules will add them again when needed
- PackagesProposal.ResetAll
- Packages.Init(true)
- SetRequiredPackages()
-
- @ret = ProductControl.RunFrom(
- Ops.add(ProductControl.CurrentStep, 1),
- false
- )
-
- @ret = :finish if @ret == :next
- else
- UpdateWizardSteps()
- SetRequiredPackages()
- @ret = ProductControl.RunFrom(
- Ops.add(ProductControl.CurrentStep, 1),
- false
- )
-
- @ret = :finish if @ret == :next
- end
-
- @ret
-
- # EOF
- end
-
- def GenerateIconID(icon_whatever)
- icon_whatever = deep_copy(icon_whatever)
- Builtins.sformat("icon_%1", Builtins.tostring(icon_whatever))
- end
-
- # Function creates term containing radio button and icon
- # based on current display (graphical/textual)
- #
- # @param button_label [String] radio button label
- # @param button_id [Symbol] radio button id
- # @param icon_file [String] path to an image
- # @param selected [true, false] whether selected (more than one buttons
selected don't make sense!)
- def CreateRadioButtonTerm(button_label, button_id, icon_file, selected)
- HBox(
- @in_textmode ?
- Empty() :
- HWeight(
- 1,
- icon_file == "" ?
- Empty() :
- Image(Id(GenerateIconID(button_id)), icon_file, "")
- ),
- HWeight(
- 5,
- Left(RadioButton(Id(button_id), Opt(:notify), button_label,
selected))
- )
- )
- end
-
- # see bugzilla #156529
- def InstModeDialogContent(pre_selected)
- HBox(
- HStretch(),
- VBox(
- Frame(
- # frame
- _("Select Mode"),
- VBox(
- # Basis RadioButtonGroup
- RadioButtonGroup(
- Id(:inst_mode),
- MarginBox(
- 2,
- 1.3,
- VBox(
- # radio button
- CreateRadioButtonTerm(
- _("New &Installation"),
- :install,
- Ops.add(
- Directory.themedir,
- "/current/icons/48x48/apps/yast-dirinstall.png"
- ),
- !Mode.update
- ),
- VSpacing(0.3),
- CreateRadioButtonTerm(
- # radio button
- _("&Update an Existing System"),
- :update,
- Ops.add(
- Directory.themedir,
- "/current/icons/48x48/apps/yast-update.png"
- ),
- Mode.update
- )
- )
- )
- )
- )
- ),
- VSpacing(2),
- @show_online_repositories == true ?
- Left(
- CheckBox(
- Id(:productsources),
- Opt(:notify),
- # check box
- _("&Add Online Repositories Before Installation"),
- Installation.productsources_selected
- )
- ) :
- Empty(),
- Left(
- CheckBox(
- Id(:add_on),
- Opt(:notify),
- # check box
- _("In&clude Add-on Products from Separate Media"),
- Installation.add_on_selected
- )
- )
- ),
- HStretch()
- )
- end
-
- def InstModeDialogHelp
- # help text for installation method
- _("<p><big><b>Installation Mode</b></big><br>\nSelect what to do:</p>") +
- # help text for installation method
- _(
- "<p>\n" +
- "Select <b>New Installation</b> if there is no existing Linux
system on your\n" +
- "machine or if you want to replace an existing Linux system
completely,\n" +
- "discarding all its configuration data.\n" +
- "</p>\n"
- ) +
- # help text for installation method
- _(
- "<p>\n" +
- "Select <b>Update an Existing System</b> to update a Linux system
already\n" +
- "installed on your machine. This option preserves configuration
settings\n" +
- "from your existing system whenever possible.\n" +
- "</p>"
- ) +
- # help text for installation option
- (@show_online_repositories == true ?
- _(
- "<p>\n" +
- "To use suggested remote repositories during installation or
update, select\n" +
- "<b>Add Online Repositories Before Installation</b>.</p>"
- ) :
- "") +
- # help text for installation method
- _(
- "<p>\n" +
- "To install an add-on product from separate media together with
&product;, select\n" +
- "<b>Include Add-on Products from Separate Media</b>.</p>\n"
- ) +
- # help text for installation method
- _(
- "<p>The feature <b>Update</b> is only\n" +
- "available if an existing Linux system has been detected.\n" +
- "</p>\n"
- ) +
- # help text: additional help for installation
- _(
- "<p>If you need specific hardware drivers for installation, see
<i>http://drivers.suse.com</i> site.</p>"
- )
- end
-
- def SetRequiredPackages
- if @new_mode == :install
- Builtins.y2milestone(
- "Adding packages required for installation to succeed..."
- )
- PackagesProposal.AddResolvables(
- "YaST-Installation",
- :package,
- ["perl-Bootloader-YAML"]
- )
- end
-
- nil
- end
- end
-end
-
-Yast::InstModeClient.new.main
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
