Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-11-07 09:15:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-25 13:03:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-11-07 09:15:20.000000000 +0100
@@ -1,0 +2,26 @@
+Thu Oct 31 11:32:01 UTC 2013 - [email protected]
+
+- install "perl-Bootloader-YAML" package
+- removed "Use Automatic Configuration" option from the
+ installation mode dialog (the 2nd stage has been removed)
+- 3.1.3
+
+-------------------------------------------------------------------
+Tue Oct 29 13:17:59 UTC 2013 - [email protected]
+
+- install only "perl-YAML-LibYAML" and "perl-bootloader" packages
+ to the target system
+- updated scr_switch_debugger.rb client
+
+-------------------------------------------------------------------
+Fri Oct 26 11:39:17 UTC 2013 - [email protected]
+
+- show release notes button (fate#314695)
+
+-------------------------------------------------------------------
+Fri Oct 25 10:06:07 CEST 2013 - [email protected]
+
+- removed long obsolete EVMS entries from control file (see
+ fate#305007)
+
+-------------------------------------------------------------------
@@ -5,0 +32,8 @@
+- 3.1.2
+
+-------------------------------------------------------------------
+Tue Oct 22 16:46:18 CEST 2013 - [email protected]
+
+- Extended support for ignored_features: They can be also mentioned
+ in PTOptions and thus not appended to Kernel command line
+ (FATE#314982)
Old:
----
yast2-installation-3.1.1.tar.bz2
New:
----
yast2-installation-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.pXqHNc/_old 2013-11-07 09:15:21.000000000 +0100
+++ /var/tmp/diff_new_pack.pXqHNc/_new 2013-11-07 09:15:21.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.1
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,8 +44,8 @@
# xmllint
BuildRequires: libxml2-tools
-# /etc/YaST2/XVersion
-BuildRequires: yast2 >= 2.16.52
+# Linuxrc.keys
+BuildRequires: yast2 >= 3.1.1
# AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1
++++++ yast2-installation-3.1.1.tar.bz2 -> yast2-installation-3.1.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/VERSION
new/yast2-installation-3.1.3/VERSION
--- old/yast2-installation-3.1.1/VERSION 2013-10-23 09:40:31.000000000
+0200
+++ new/yast2-installation-3.1.3/VERSION 2013-11-01 13:10:18.000000000
+0100
@@ -1 +1 @@
-3.1.1
+3.1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/control/README
new/yast2-installation-3.1.3/control/README
--- old/yast2-installation-3.1.1/control/README 2013-10-23 09:40:31.000000000
+0200
+++ new/yast2-installation-3.1.3/control/README 2013-11-01 13:10:18.000000000
+0100
@@ -5,7 +5,7 @@
products. Those special package are used when creating the CDs and they
install the control file into the first CD of the product.
- Any modification to the control file in the CVS tree of YaST wont
+ Any modification to the control file in the YaST Git tree will not
appear in the respective products. Such changes have to be done in the
following packages instead:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.SLED.xml
new/yast2-installation-3.1.3/control/control.SLED.xml
--- old/yast2-installation-3.1.1/control/control.SLED.xml 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/control.SLED.xml 2013-11-01
13:10:18.000000000 +0100
@@ -309,17 +309,14 @@
</software>
<partitioning>
- <evms_config config:type="boolean">false</evms_config>
<try_separate_home config:type="boolean">true</try_separate_home>
<limit_try_home>14GB</limit_try_home>
<root_space_percent>40</root_space_percent>
<root_base_size>3GB</root_base_size>
<root_max_size>10GB</root_max_size>
<proposal_lvm config:type="boolean">false</proposal_lvm>
- <proposal_evms config:type="boolean">false</proposal_evms>
<vm_desired_size>15GB</vm_desired_size>
<vm_home_max_size>25GB</vm_home_max_size>
- <boot_evms config:type="boolean">false</boot_evms>
<btrfs_increase_percentage
config:type="integer">100</btrfs_increase_percentage>
</partitioning>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/control/control.SLES-for-VMware.xml
new/yast2-installation-3.1.3/control/control.SLES-for-VMware.xml
--- old/yast2-installation-3.1.1/control/control.SLES-for-VMware.xml
2013-10-23 09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/control.SLES-for-VMware.xml
2013-11-01 13:10:18.000000000 +0100
@@ -240,17 +240,14 @@
</software>
<partitioning>
- <evms_config config:type="boolean">true</evms_config>
<try_separate_home config:type="boolean">false</try_separate_home>
<limit_try_home>5GB</limit_try_home>
<root_space_percent>40</root_space_percent>
<root_base_size>3GB</root_base_size>
<root_max_size>10GB</root_max_size>
<proposal_lvm config:type="boolean">false</proposal_lvm>
- <proposal_evms config:type="boolean">false</proposal_evms>
<vm_desired_size>15GB</vm_desired_size>
<vm_home_max_size>25GB</vm_home_max_size>
- <boot_evms config:type="boolean">false</boot_evms>
<btrfs_increase_percentage
config:type="integer">100</btrfs_increase_percentage>
</partitioning>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.SLES.xml
new/yast2-installation-3.1.3/control/control.SLES.xml
--- old/yast2-installation-3.1.1/control/control.SLES.xml 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/control.SLES.xml 2013-11-01
13:10:18.000000000 +0100
@@ -263,17 +263,14 @@
</software>
<partitioning>
- <evms_config config:type="boolean">true</evms_config>
<try_separate_home config:type="boolean">false</try_separate_home>
<limit_try_home>5GB</limit_try_home>
<root_space_percent>40</root_space_percent>
<root_base_size>3GB</root_base_size>
<root_max_size>10GB</root_max_size>
<proposal_lvm config:type="boolean">false</proposal_lvm>
- <proposal_evms config:type="boolean">false</proposal_evms>
<vm_desired_size>15GB</vm_desired_size>
<vm_home_max_size>25GB</vm_home_max_size>
- <boot_evms config:type="boolean">false</boot_evms>
<btrfs_increase_percentage
config:type="integer">100</btrfs_increase_percentage>
</partitioning>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/control/control.openSUSE.xml
new/yast2-installation-3.1.3/control/control.openSUSE.xml
--- old/yast2-installation-3.1.1/control/control.openSUSE.xml 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/control.openSUSE.xml 2013-11-01
13:10:18.000000000 +0100
@@ -677,9 +677,30 @@
<label>System Analysis</label>
<name>system_analysis</name>
</module>
+ <module>
+ <label>Disk</label>
+ <name>disk_proposal</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+<!--
+TODO: prepare disk here when it does not break space calculation (and remove
below)
<module>
- <label>System Analysis</label>
- <name>mode</name>
+ <label>Disk</label>
+ <name>prepdisk</name>
+ </module>
+TODO: inst_start_deploy_image does not exist yet
+ <module>
+ <name>start_deploy_image</name>
+ </module>
+-->
+ <module>
+ <label>Time Zone</label>
+ <name>timezone</name>
+ <arguments>
+ <first_run>yes</first_run>
+ </arguments>
+ <enable_back>yes</enable_back>
</module>
<!-- Here, user selects whether to perform New Installation,
Upgrade, or Repair -->
<module>
@@ -692,14 +713,6 @@
<name>add-on</name>
<enable_back>yes</enable_back>
</module>
- <module>
- <label>Time Zone</label>
- <name>timezone</name>
- <arguments>
- <first_run>yes</first_run>
- </arguments>
- <enable_back>yes</enable_back>
- </module>
<module>
<label>Desktop Selection</label>
<name>new_desktop</name>
@@ -712,12 +725,6 @@
<enable_next>yes</enable_next>
</module>
-->
- <module>
- <label>Disk</label>
- <name>disk_proposal</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
<module>
<label>User Settings</label>
<name>user_first</name>
@@ -742,7 +749,7 @@
<name>prepareprogress</name>
</module>
<module>
- <label>Perform Installation</label>
+ <label>Perform Installation</label>
<name>prepdisk</name>
</module>
<!-- Installation from images -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.rnc
new/yast2-installation-3.1.3/control/control.rnc
--- old/yast2-installation-3.1.1/control/control.rnc 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/control.rnc 2013-11-01
13:10:18.000000000 +0100
@@ -403,17 +403,14 @@
# partitioning
partitioning_elements =
- evms_config
- | try_separate_home
+ try_separate_home
| limit_try_home
| root_space_percent
| root_base_size
| root_max_size
| proposal_lvm
- | proposal_evms
| vm_desired_size
| vm_home_max_size
- | boot_evms
| use_separate_multipath_module
| prefer_remove
| vm_keep_unpartitioned_region
@@ -421,17 +418,14 @@
| partitions
| btrfs_increase_percentage
-evms_config = element evms_config { BOOLEAN }
try_separate_home = element try_separate_home { BOOLEAN }
limit_try_home = element limit_try_home { text }
root_space_percent = element root_space_percent { text }
root_base_size = element root_base_size { text }
root_max_size = element root_max_size { text }
proposal_lvm = element proposal_lvm { BOOLEAN }
-proposal_evms = element proposal_evms { BOOLEAN }
vm_desired_size = element vm_desired_size { text }
vm_home_max_size = element vm_home_max_size { text }
-boot_evms = element boot_evms { BOOLEAN }
prefer_remove = element prefer_remove { BOOLEAN }
remove_special_partitions = element remove_special_partitions { BOOLEAN }
vm_keep_unpartitioned_region = element vm_keep_unpartitioned_region { BOOLEAN }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.xml
new/yast2-installation-3.1.3/control/control.xml
--- old/yast2-installation-3.1.1/control/control.xml 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/control.xml 2013-11-01
13:10:18.000000000 +0100
@@ -32,7 +32,6 @@
<selection_type config:type="symbol">auto</selection_type>
</software>
<partitioning>
- <evms_config config:type="boolean">false</evms_config>
<try_separate_home config:type="boolean">true</try_separate_home>
<limit_try_home>5GB</limit_try_home>
<root_space_percent>40</root_space_percent>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/control/docs/examples/update-difffileformat.xml
new/yast2-installation-3.1.3/control/docs/examples/update-difffileformat.xml
---
old/yast2-installation-3.1.1/control/docs/examples/update-difffileformat.xml
2013-10-23 09:40:31.000000000 +0200
+++
new/yast2-installation-3.1.3/control/docs/examples/update-difffileformat.xml
2013-11-01 13:10:18.000000000 +0100
@@ -1,4 +1,3 @@
-
<?xml version="1.0"?>
<productDefines xmlns="http://www.suse.com/1.0/yast2ns";
xmlns:config="http://www.suse.com/1.0/configns";>
@@ -12,7 +11,6 @@
<selection_type config:type="symbol">auto</selection_type>
</software>
<partitioning>
- <evms_config config:type="boolean">false</evms_config>
<root_max_size>10G</root_max_size>
</partitioning>
<network>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/control/examples/add-on-2.xml
new/yast2-installation-3.1.3/control/examples/add-on-2.xml
--- old/yast2-installation-3.1.1/control/examples/add-on-2.xml 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/examples/add-on-2.xml 2013-11-01
13:10:18.000000000 +0100
@@ -11,7 +11,6 @@
<selection_type config:type="symbol">auto</selection_type>
</software>
<partitioning>
- <evms_config config:type="boolean">false</evms_config>
<root_max_size>10G</root_max_size>
</partitioning>
<network>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/control/examples/custom.xml
new/yast2-installation-3.1.3/control/examples/custom.xml
--- old/yast2-installation-3.1.1/control/examples/custom.xml 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/examples/custom.xml 2013-11-01
13:10:18.000000000 +0100
@@ -25,7 +25,6 @@
<base_selection>Minimal+X11</base_selection>
</software>
<partitioning>
- <evms_config config:type="boolean">false</evms_config>
<partitions config:type="list">
<partition>
<disk config:type="integer">2</disk>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/control/tests/test.xml
new/yast2-installation-3.1.3/control/tests/test.xml
--- old/yast2-installation-3.1.1/control/tests/test.xml 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/control/tests/test.xml 2013-11-01
13:10:18.000000000 +0100
@@ -22,7 +22,6 @@
<selection_type config:type="symbol">auto</selection_type>
</software>
<partitioning>
- <evms_config config:type="boolean">false</evms_config>
</partitioning>
<proposals config:type="list">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/package/yast2-installation.changes
new/yast2-installation-3.1.3/package/yast2-installation.changes
--- old/yast2-installation-3.1.1/package/yast2-installation.changes
2013-10-23 09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/package/yast2-installation.changes
2013-11-01 13:10:18.000000000 +0100
@@ -1,8 +1,42 @@
-------------------------------------------------------------------
+Thu Oct 31 11:32:01 UTC 2013 - [email protected]
+
+- install "perl-Bootloader-YAML" package
+- removed "Use Automatic Configuration" option from the
+ installation mode dialog (the 2nd stage has been removed)
+- 3.1.3
+
+-------------------------------------------------------------------
+Tue Oct 29 13:17:59 UTC 2013 - [email protected]
+
+- install only "perl-YAML-LibYAML" and "perl-bootloader" packages
+ to the target system
+- updated scr_switch_debugger.rb client
+
+-------------------------------------------------------------------
+Fri Oct 26 11:39:17 UTC 2013 - [email protected]
+
+- show release notes button (fate#314695)
+
+-------------------------------------------------------------------
+Fri Oct 25 10:06:07 CEST 2013 - [email protected]
+
+- removed long obsolete EVMS entries from control file (see
+ fate#305007)
+
+-------------------------------------------------------------------
Wed Oct 23 07:27:28 UTC 2013 - [email protected]
- removed autorepeat workaround for bnc#346186, not needed anymore,
xset might not be installed (bnc#846768)
+- 3.1.2
+
+-------------------------------------------------------------------
+Tue Oct 22 16:46:18 CEST 2013 - [email protected]
+
+- Extended support for ignored_features: They can be also mentioned
+ in PTOptions and thus not appended to Kernel command line
+ (FATE#314982)
-------------------------------------------------------------------
Tue Oct 15 14:15:31 CEST 2013 - [email protected]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/package/yast2-installation.spec
new/yast2-installation-3.1.3/package/yast2-installation.spec
--- old/yast2-installation-3.1.1/package/yast2-installation.spec
2013-10-23 09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/package/yast2-installation.spec
2013-11-01 13:10:18.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.1
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -41,8 +41,8 @@
# xmllint
BuildRequires: libxml2-tools
-# /etc/YaST2/XVersion
-BuildRequires: yast2 >= 2.16.52
+# Linuxrc.keys
+BuildRequires: yast2 >= 3.1.1
# AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/src/Makefile.am
new/yast2-installation-3.1.3/src/Makefile.am
--- old/yast2-installation-3.1.1/src/Makefile.am 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/Makefile.am 2013-11-01
13:10:18.000000000 +0100
@@ -3,6 +3,7 @@
module_DATA = \
modules/ImageInstallation.rb \
modules/InstData.rb \
+ modules/InstFunctions.rb \
modules/Vendor.rb \
modules/SystemFilesCopy.rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/src/clients/inst_complex_welcome.rb
new/yast2-installation-3.1.3/src/clients/inst_complex_welcome.rb
--- old/yast2-installation-3.1.1/src/clients/inst_complex_welcome.rb
2013-10-23 09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/clients/inst_complex_welcome.rb
2013-11-01 13:10:18.000000000 +0100
@@ -83,7 +83,7 @@
# Build dialog
# ----------------------------------------------------------------------
# heading text
- @heading_text = _("Welcome")
+ @heading_text = _("Language, Keyboard and License Agreement")
@languagesel = ComboBox(
Id(:language),
@@ -119,29 +119,35 @@
VWeight(1, VStretch()),
Left(
HSquash(
- VBox(
- HBox(
- HSquash(Icon.Simple("yast-language")),
- @text_mode == true ? Empty() : HSpacing(2),
- Left(@languagesel)
- ),
- VSpacing(1),
- HBox(
- HSquash(Icon.Simple("yast-keyboard")),
- @text_mode == true ? Empty() : HSpacing(2),
- Left(@keyboardsel)
- ),
- VSpacing(1)
+ 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)
)
)
),
+ VSpacing(1),
VWeight(1, VStretch()),
VWeight(
20,
Left(
HSquash(
VBox(
- Left(Label(Opt(:boldFont), _("License Agreement"))),
+ HBox(
+ Label(Opt(:boldFont), _("License Agreement")),
+ HStretch(),
+ # ID: #ICW_B1 button
+ PushButton(
+ Id(:show_fulscreen_license),
+ # TRANSLATORS: button label
+ _("License &Translations...")
+ )
+ ),
# bnc #438100
HSquash(
MinWidth(
@@ -154,17 +160,10 @@
MinHeight(
1,
HBox(
+ HStretch(),
# Will be replaced with license checkbox if required
ReplacePoint(Id(:license_checkbox_rp), Empty()),
- VSpacing(1),
- # TRANSLATORS: button label
- # ID: #ICW_B1 button
- Right(
- PushButton(
- Id(:show_fulscreen_license),
- _("License &Translations...")
- )
- )
+ HStretch()
)
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/src/clients/inst_mode.rb
new/yast2-installation-3.1.3/src/clients/inst_mode.rb
--- old/yast2-installation-3.1.1/src/clients/inst_mode.rb 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/clients/inst_mode.rb 2013-11-01
13:10:18.000000000 +0100
@@ -125,11 +125,7 @@
end if !@in_textmode
end
- Builtins.y2milestone(
- "Initial Mode: %1, AC: %2",
- Mode.mode,
- ProductControl.GetUseAutomaticConfiguration
- )
+ Builtins.y2milestone("Initial Mode: #{Mode.mode}")
AdjustStepsAccordingToInstallationSettings()
begin
@ret = Convert.to_symbol(UI.UserInput)
@@ -149,25 +145,6 @@
end
@ret = nil
next
- # FIXME: this mode needs more RAM because it starts another YaST
process.
- # Warn user and/or disable the option if a machine has not enough
memory.
-
- # Use-Automatic-Configuration status changed
- elsif @ret == :use_automatic_configuration
- if UI.WidgetExists(Id(:use_automatic_configuration))
- ProductControl.SetUseAutomaticConfiguration(
- Convert.to_boolean(
- UI.QueryWidget(Id(:use_automatic_configuration), :Value)
- )
- )
- Builtins.y2milestone(
- "GetUseAutomaticConfiguration: %1",
- ProductControl.GetUseAutomaticConfiguration
- )
- AdjustStepsAccordingToInstallationSettings()
- end
- @ret = nil
- next
# Use-Community-Repositories status changed
elsif @ret == :productsources
if UI.WidgetExists(Id(:productsources))
@@ -197,26 +174,12 @@
:productsources,
Installation.productsources_selected,
@show_online_repositories && @ret != :repair
- ],
- # automatic installation works only for new installation
- [
- :use_automatic_configuration,
- ProductControl.GetUseAutomaticConfiguration && @ret ==
:install,
- @ret == :install
]
]
) do |one_item|
- if UI.WidgetExists(Id(Ops.get_symbol(one_item, 0, :_inotdef_)))
- UI.ChangeWidget(
- Id(Ops.get_symbol(one_item, 0, :_inotdef_)),
- :Enabled,
- Ops.get_boolean(one_item, 2, false)
- )
- UI.ChangeWidget(
- Id(Ops.get_symbol(one_item, 0, :_inotdef_)),
- :Value,
- Ops.get_boolean(one_item, 1, false)
- )
+ 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
@@ -427,18 +390,7 @@
_("In&clude Add-on Products from Separate Media"),
Installation.add_on_selected
)
- ),
- InstData.enable_autoconfiguration == true ?
- Left(
- CheckBox(
- Id(:use_automatic_configuration),
- Opt(:notify),
- # check box
- _("&Use Automatic Configuration"),
- ProductControl.GetUseAutomaticConfiguration
- )
- ) :
- Empty()
+ )
),
HStretch()
)
@@ -478,19 +430,6 @@
"<b>Include Add-on Products from Separate Media</b>.</p>\n"
) +
# help text for installation method
- (InstData.enable_autoconfiguration == true ?
- _(
- "<p>\n" +
- "Select <b>Use Automatic Configuration</b> to let the
installation program\n" +
- "configure your network and hardware automatically. Otherwise
you will\n" +
- "be offered a configuration proposal with the possibility to
tune all the\n" +
- "settings manually. Inexperienced users are advised to use
automatic\n" +
- "configuration.</p>\n"
- ) +
- # help text for installation method
- _("<p>Update mode does not support automatic configuration.</p>") :
- "") +
- # help text for installation method
_(
"<p>The feature <b>Update</b> is only\n" +
"available if an existing Linux system has been detected.\n" +
@@ -502,7 +441,6 @@
)
end
- # BNC #469730: Installation requires some packages
def SetRequiredPackages
if @new_mode == :install
Builtins.y2milestone(
@@ -511,16 +449,7 @@
PackagesProposal.AddResolvables(
"YaST-Installation",
:package,
- ["yast2-installation"]
- )
- elsif @new_mode == :update
- Builtins.y2milestone(
- "Adding packages required for update to succeed..."
- )
- PackagesProposal.AddResolvables(
- "YaST-Update",
- :package,
- ["yast2-update"]
+ ["perl-Bootloader-YAML"]
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/src/clients/inst_worker_initial.rb
new/yast2-installation-3.1.3/src/clients/inst_worker_initial.rb
--- old/yast2-installation-3.1.1/src/clients/inst_worker_initial.rb
2013-10-23 09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/clients/inst_worker_initial.rb
2013-11-01 13:10:18.000000000 +0100
@@ -101,6 +101,9 @@
WFM.CallFunction("inst_check_autoinst_mode", [])
end
+ # Show the "Release Notes" button
+ Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."),
"show_release_notes")
+
@ret = nil
# --- Runing the installation workflow ---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/src/clients/installation.rb
new/yast2-installation-3.1.3/src/clients/installation.rb
--- old/yast2-installation-3.1.1/src/clients/installation.rb 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/clients/installation.rb 2013-11-01
13:10:18.000000000 +0100
@@ -38,7 +38,7 @@
Yast.import "Report"
# Initialize the UI
- Wizard.OpenNextBackStepsDialog
+ Wizard.OpenNextBackDialog
Wizard.SetContents(
# title
"",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/src/clients/kernel_finish.rb
new/yast2-installation-3.1.3/src/clients/kernel_finish.rb
--- old/yast2-installation-3.1.1/src/clients/kernel_finish.rb 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/clients/kernel_finish.rb 2013-11-01
13:10:18.000000000 +0100
@@ -72,7 +72,7 @@
elsif @func == "Write"
ModulesConf.Save(true)
- # on SGI Altix add fetchop and mmtimer to MODULES_LOADED_ON_BOOT
+ # on SGI Altix add fetchop and mmtimer to /etc/modules.d/
if Ops.greater_than(SCR.Read(path(".target.size"), "/proc/sgi_sn"), 0)
Builtins.y2milestone("found SGI Altix, adding fetchop and mmtimer")
Kernel.AddModuleToLoad("fetchop")
@@ -135,29 +135,6 @@
false
end
-
- def adjust_kernel_modules
- all_modules = Convert.to_string(
- SCR.Read(path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT"))
- )
- all_modules = "" if all_modules == nil
- modules = Builtins.splitstring(all_modules, " \t\n")
- Builtins.y2milestone("Modules: %1", modules)
-
- # already there
- return true if Builtins.contains(modules, @module_to_load_dell)
-
- Builtins.y2milestone(
- "Adding '%1' module to sysconfig/kernel:MODULES_LOADED_ON_BOOT",
- @module_to_load_dell
- )
- modules = Builtins.add(modules, @module_to_load_dell)
- SCR.Write(
- path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT"),
- Builtins.mergestring(modules, " ")
- )
- SCR.Write(path(".sysconfig.kernel"), nil)
- end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/src/include/installation/inst_inc_first.rb
new/yast2-installation-3.1.3/src/include/installation/inst_inc_first.rb
--- old/yast2-installation-3.1.1/src/include/installation/inst_inc_first.rb
2013-10-23 09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/include/installation/inst_inc_first.rb
2013-11-01 13:10:18.000000000 +0100
@@ -123,32 +123,6 @@
ProductControl.DisableModule("user_non_interactive")
ProductControl.DisableModule("auth")
- Builtins.y2milestone("Adjusting automatic configuration")
- # FATE #303396, Make second stage non-interactive
- enable_autoconfiguration = ProductFeatures.GetBooleanFeature(
- "globals",
- "enable_autoconfiguration"
- )
- autoconfiguration_default = ProductFeatures.GetBooleanFeature(
- "globals",
- "autoconfiguration_default"
- )
-
- # bnc#679435: leave normal second stage for autoYaST
- if Mode.autoinst
- enable_autoconfiguration = false
- autoconfiguration_default = false
- end
-
- # Enabled only when AC is selected
- InstData.enable_autoconfiguration = enable_autoconfiguration == true
- # Default state
- ProductControl.SetUseAutomaticConfiguration(
- autoconfiguration_default == true
- )
- # Enables or disables some modules, etc.
- AdjustAutomaticConfiguration()
-
nil
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/src/include/installation/misc.rb
new/yast2-installation-3.1.3/src/include/installation/misc.rb
--- old/yast2-installation-3.1.1/src/include/installation/misc.rb
2013-10-23 09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/include/installation/misc.rb
2013-11-01 13:10:18.000000000 +0100
@@ -344,33 +344,7 @@
nil
end
- def AdjustAutomaticConfiguration
- # AC is supported in Mode::installation only
- if Mode.installation && ProductControl.GetUseAutomaticConfiguration
- Builtins.y2milestone("Using AC...")
-
- ProductControl.DisableAllModulesAndProposals("installation",
"continue")
- ProductControl.EnableModule("automatic_configuration")
-
- # Enable Modules that are required to run even if using AC, bnc #428190
- EnableRequiredModules()
-
- # Otherwise it is always disabled
- else
- Builtins.y2milestone("Not using AC...")
-
- ProductControl.UnDisableAllModulesAndProposals(
- "installation",
- "continue"
- )
- ProductControl.DisableModule("automatic_configuration")
- end
-
- nil
- end
-
def AdjustStepsAccordingToInstallationSettings
- AdjustAutomaticConfiguration()
if Installation.add_on_selected == true ||
Linuxrc.InstallInf("addon") != nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/src/include/installation/scr_switch_debugger.rb
new/yast2-installation-3.1.3/src/include/installation/scr_switch_debugger.rb
---
old/yast2-installation-3.1.1/src/include/installation/scr_switch_debugger.rb
2013-10-23 09:40:31.000000000 +0200
+++
new/yast2-installation-3.1.3/src/include/installation/scr_switch_debugger.rb
2013-11-01 13:10:18.000000000 +0100
@@ -52,7 +52,7 @@
# test result (Checking for xyz... Passed)
@result_ok = _("Passed")
# test result (Checking for xyz... Failed)
- @result_failed = "Failed"
+ @result_failed = _("Failed")
# *********************************************************************
@@ -74,20 +74,12 @@
# any command for the chroot command
@test_do_chroot = "/bin/ls -1 /"
- # y2base path
- @test_y2base = "/usr/lib/YaST2/bin/y2base"
-
# get all installed rpm packages
@test_rpm = "rpm -qa"
- # all needed rpm packages
- @needed_rpm_packages = [
- "yast2",
- "yast2-installation",
- "yast2-core",
- "yast2-bootloader",
- "yast2-packager"
- ]
+ # all needed rpm packages, Yast might not be installed at the target
system,
+ # so only glibc seems to be really needed...
+ @needed_rpm_packages = ["glibc"]
# is the package %1 installed?
@test_one_rpm = "rpm -q %1"
@@ -345,24 +337,6 @@
test_result
end
- # checks whether the y2base binary exists
- def RunSCRSwitchTest_Y2BASE
- y2basefile = Builtins.sformat("%1%2", @chroot_path, @test_y2base)
- test_result = FileUtils.Exists(y2basefile)
-
- ReportTest(
- # Test progress
- Builtins.sformat(
- _("Checking for %1 in %2..."),
- @test_y2base,
- @chroot_path
- ),
- test_result
- )
-
- test_result
- end
-
def RunSCRSwitchTest_FreeSpace
ReportProgress(_("Checking free space"))
@@ -602,10 +576,9 @@
# checks a package, whether it is installed
# if it is installed, whether is has installed requires
def RunSCRSwitchTest_DoNeededRPMsCheck
- ret = true
# check whether all needed packages are installed
- Builtins.foreach(Builtins.sort(@needed_rpm_packages)) do |package_name|
+ @needed_rpm_packages.sort.all? do |package_name|
# Test progress
ReportProgress(
Builtins.sformat(
@@ -613,18 +586,10 @@
package_name
)
)
- # is the package installed?
- if !RunSCRSwitchTest_CheckWhetherInstalled(package_name)
- ret = false
- raise Break
- # if it is installed, check whetheris has all dependencies
- elsif !RunSCRSwitchTest_DoNeededRPMsRequire(package_name)
- ret = false
- raise Break
- end
- end
- ret
+ # is the package installed? all dependencies Ok?
+ RunSCRSwitchTest_CheckWhetherInstalled(package_name) &&
RunSCRSwitchTest_DoNeededRPMsRequire(package_name)
+ end
end
def PrintLinesFromTo(from_line, to_line)
@@ -710,7 +675,6 @@
return false if !RunSCRSwitchTest_ListFilesInChroot()
return false if !RunSCRSwitchTest_BinaryExists()
return false if !RunSCRSwitchTest_DoChroot()
- return false if !RunSCRSwitchTest_Y2BASE()
return false if !RunSCRSwitchTest_FreeSpace()
return false if !RunSCRSwitchTest_DoRPMCheck()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/src/modules/InstData.rb
new/yast2-installation-3.1.3/src/modules/InstData.rb
--- old/yast2-installation-3.1.1/src/modules/InstData.rb 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/modules/InstData.rb 2013-11-01
13:10:18.000000000 +0100
@@ -82,10 +82,6 @@
@localDisabledModules = []
@localDisabledProposals = []
- # FATE #303396, Non-interactive second stage
- # this variable enables a check box in dialog
- @enable_autoconfiguration = false
-
# <-- other
# --> copy files -- config
@@ -112,7 +108,6 @@
publish :variable => :wizardsteps_disabled_ac_items, :type => "string"
publish :variable => :localDisabledModules, :type => "list <string>"
publish :variable => :localDisabledProposals, :type => "list <string>"
- publish :variable => :enable_autoconfiguration, :type => "boolean"
publish :variable => :copy_files_use_control_file, :type => "boolean"
publish :variable => :additional_copy_files, :type => "list <map>"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.1/src/modules/InstFunctions.rb
new/yast2-installation-3.1.3/src/modules/InstFunctions.rb
--- old/yast2-installation-3.1.1/src/modules/InstFunctions.rb 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/src/modules/InstFunctions.rb 2013-11-01
13:10:18.000000000 +0100
@@ -40,22 +40,38 @@
#
# - Allowed format is ignore[d][_]feature[s]=$feature1[,$feature2,[...]]
# - Multiple ignored_features are allowed on one command line
- # - Command and features are case-insensitive and all dashes
- # and underscores are ignored
+ # - Command and features are case-insensitive and all dashes,
+ # underscores and dots are ignored to be compatible with Linuxrc,
+ # see #polish and http://en.opensuse.org/SDB:Linuxrc#Passing_parameters
+ # - If entries are also mentioned in PTOptions, they do not appear in
+ # 'Cmdline' but as separate entries,
+ # see http://en.opensuse.org/SDB:Linuxrc#p_ptoptions
#
# @return [Array] ignored features
def ignored_features
return @ignored_features if @ignored_features
- cmdline = Linuxrc.InstallInf("Cmdline").downcase.tr("-_", "").split
- ignored_features = cmdline.select do |cmd|
+ # Features defined as individual entries in install.inf
+ features_keys = Linuxrc.keys.select do |key|
+ polish(key) =~ /^ignored?features?$/
+ end
+
+ unparsed_features = features_keys.map do |key|
+ polish(Linuxrc.InstallInf(key))
+ end
+
+ # Features mentioned in 'Cmdline' entry
+ cmdline = polish(Linuxrc.InstallInf("Cmdline")).split
+ cmdline_features = cmdline.select do |cmd|
cmd =~ /^ignored?features?=/i
end
- ignored_features.collect! do |feature|
+ cmdline_features.collect! do |feature|
feature.gsub(/^ignored?features?=(.*)/i, '\1')
end
+ # Both are supported together
+ ignored_features = unparsed_features + cmdline_features
@ignored_features = ignored_features.map{ |f| f.split(',') }.flatten.uniq
end
@@ -75,12 +91,27 @@
return false
end
- feature = feature_name.downcase.tr("-_", "")
+ feature = polish(feature_name)
ignored_features.include?(feature)
end
publish :function => :ignored_features, :type => "list ()"
publish :function => :feature_ignored?, :type => "boolean (string)"
+
+ private
+
+ # Removes unneeded characters from the given string
+ # for easier handling
+ #
+ # These unneeded characters are entered by user on Linuxrc commandline
+ # we remove them everywhere, and down-case all strings so it's very easy
+ # to match given features with user-entered strings
+ #
+ # @param [String] feature
+ # @return [String] polished feature
+ def polish(feature)
+ feature.downcase.tr("-_\.", "")
+ end
end
InstFunctions = InstFunctionsClass.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.1/test/inst_functions.rb
new/yast2-installation-3.1.3/test/inst_functions.rb
--- old/yast2-installation-3.1.1/test/inst_functions.rb 2013-10-23
09:40:31.000000000 +0200
+++ new/yast2-installation-3.1.3/test/inst_functions.rb 2013-11-01
13:10:18.000000000 +0100
@@ -45,7 +45,7 @@
end
it "returns list of features set on commandline by several entries, each
feature in separate entry" do
- linuxrc_commandline = "trash=install ignore_feature=feature1
ignored_features=feature2 ignore_features=feature3"
+ linuxrc_commandline = "trash=install ignore_feature=f.e.a.ture1
ig.n.o.red_features=feature2 ignore_features=feature3"
ignored_features = ["feature1", "feature2", "feature3"].sort
Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
@@ -67,9 +67,30 @@
Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
end
+
+ # PTOptions makes a command hidden from 'Cmdline' and creates
+ # a new install.inf entry using the exact name as it appears in PTOptions
+ # @see http://en.opensuse.org/SDB:Linuxrc#p_ptoptions
+ it "returns features set on commandline together with ptoptions" do
+ install_inf = {
+ 'ignored_features' => 'f1,f2,f3',
+ 'IgnoReDfEAtuRes' => 'f2,f4',
+ 'i.g.n.o.r.e.d.features' => 'f1,f5',
+ 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7',
+ 'another_feature' => 'another_value',
+ 'Cmdline' => 'splash=silent vga=0x314',
+ 'Keyboard' => '1',
+ }
+ Yast::Linuxrc.stub(:keys).and_return(install_inf.keys)
+ install_inf.keys.each do |key|
+ Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key])
+ end
+
+ expect(Yast::InstFunctions.ignored_features.sort).to
eq(['f1','f2','f3','f4','f5','f6','f7'])
+ end
end
-describe "when checking whether feature is ignored" do
+describe "#feature_ignored?" do
before(:each) do
Yast::InstFunctions.reset_ignored_features
end
@@ -115,4 +136,42 @@
Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
expect(Yast::InstFunctions.feature_ignored?(nil)).to be_false
end
+
+ it "should be true if feature is mentioned as a separate install.inf entry
or in Cmdline" do
+ install_inf = {
+ 'ignored_features' => 'f1,f2,f3',
+ 'IgnoReDfEAtuRes' => 'f2,f4',
+ 'i.g.n.o.r.e.d.features' => 'f1,f5',
+ 'IGNORED-FEA-T-U-RES' => 'f6,f7,f7,f7',
+ 'another_feature' => 'another_value',
+ 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8',
+ 'Keyboard' => '1',
+ }
+ Yast::Linuxrc.stub(:keys).and_return(install_inf.keys)
+ install_inf.keys.each do |key|
+ Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key])
+ end
+
+ ['f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8'].each do |key|
+ expect(Yast::InstFunctions.feature_ignored?(key)).to be_true, "Key
#{key} is not ignored"
+ end
+ end
+
+ it "should be false if feature is not mentioned as a separate install.inf
entry or in Cmdline" do
+ install_inf = {
+ 'ignored_features' => 'f1,f2,f3',
+ 'IgnoReDfEAtuRes' => 'f2,f4',
+ 'i.g.n.o.r.e.d.features' => 'f1,f5',
+ 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7',
+ 'another_feature' => 'another_value',
+ 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8',
+ 'Keyboard' => '1',
+ }
+ Yast::Linuxrc.stub(:keys).and_return(install_inf.keys)
+ install_inf.keys.each do |key|
+ Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key])
+ end
+
+ expect(Yast::InstFunctions.feature_ignored?('f9')).to be_false
+ end
end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
