Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-12-03 10:50:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-28 19:08:23.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-12-03 10:50:54.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Dec 2 12:28:26 UTC 2013 - [email protected]
+
+- Add direct link to network communication from remote disks
+ activation (FATE#314695, part of NI requirements)
+- 3.1.9
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.8.tar.bz2
New:
----
yast2-installation-3.1.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.lGcjov/_old 2013-12-03 10:50:55.000000000 +0100
+++ /var/tmp/diff_new_pack.lGcjov/_new 2013-12-03 10:50:55.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.8
+Version: 3.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.8.tar.bz2 -> yast2-installation-3.1.9.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.8/VERSION
new/yast2-installation-3.1.9/VERSION
--- old/yast2-installation-3.1.8/VERSION 2013-11-28 14:25:30.000000000
+0100
+++ new/yast2-installation-3.1.9/VERSION 2013-12-02 16:09:59.000000000
+0100
@@ -1 +1 @@
-3.1.8
+3.1.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.8/package/yast2-installation.changes
new/yast2-installation-3.1.9/package/yast2-installation.changes
--- old/yast2-installation-3.1.8/package/yast2-installation.changes
2013-11-28 14:25:30.000000000 +0100
+++ new/yast2-installation-3.1.9/package/yast2-installation.changes
2013-12-02 16:09:59.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Dec 2 12:28:26 UTC 2013 - [email protected]
+
+- Add direct link to network communication from remote disks
+ activation (FATE#314695, part of NI requirements)
+- 3.1.9
+
+-------------------------------------------------------------------
Thu Nov 28 13:01:44 UTC 2013 - [email protected]
- Add hooks to main installation client
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.8/package/yast2-installation.spec
new/yast2-installation-3.1.9/package/yast2-installation.spec
--- old/yast2-installation-3.1.8/package/yast2-installation.spec
2013-11-28 14:25:30.000000000 +0100
+++ new/yast2-installation-3.1.9/package/yast2-installation.spec
2013-12-02 16:09:59.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.8
+Version: 3.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.8/src/clients/inst_disks_activate.rb
new/yast2-installation-3.1.9/src/clients/inst_disks_activate.rb
--- old/yast2-installation-3.1.8/src/clients/inst_disks_activate.rb
2013-11-28 14:25:30.000000000 +0100
+++ new/yast2-installation-3.1.9/src/clients/inst_disks_activate.rb
2013-12-02 16:09:59.000000000 +0100
@@ -60,27 +60,12 @@
UI.OpenDialog(Label(_("Detecting Available Controllers")))
# detect DASD disks
- @disks = Convert.convert(
- SCR.Read(path(".probe.disk")),
- :from => "any",
- :to => "list <map <string, any>>"
- )
-
- @disks = Builtins.filter(@disks) do |d|
- Builtins.tolower(Ops.get_string(d, "device", "")) == "dasd"
- end
- @have_dasd = Ops.greater_than(Builtins.size(@disks), 0)
+ disks = SCR.Read(path(".probe.disk"))
+ @have_dasd = disks.any? {|d| d["device"] == "dasd" }
# detect zFCP disks
- @controllers = Convert.convert(
- SCR.Read(path(".probe.storage")),
- :from => "any",
- :to => "list <map <string, any>>"
- )
- @controllers = Builtins.filter(@controllers) do |c|
- Ops.get_string(c, "device", "") == "zFCP controller"
- end
- @have_zfcp = Ops.greater_than(Builtins.size(@controllers), 0)
+ controllers = SCR.Read(path(".probe.storage"))
+ @have_zfcp = controllers.any? {|c| c["device"] == "zFCP controller" }
UI.CloseDialog
end
@@ -93,55 +78,39 @@
@help = ""
+ missing_part = [
+ VSpacing(0),
+ VSpacing(0)
+ ]
+
+ dasd_part = if @have_dasd
+ button_with_spacing(:dasd, _("Configure &DASD Disks"))
+ else
+ missing_part
+ end
+
+ zfcp_part = if @have_zfcp
+ button_with_spacing(:zfce, _("Configure &ZFCP Disks"))
+ else
+ missing_part
+ end
+
+ fcoe_part = if @want_fcoe
+ button_with_spacing(:fcoe, _("Configure &FCoE Interfaces"))
+ else
+ missing_part
+ end
+
+
@contents = HBox(
HWeight(999, HStretch()),
VBox(
VStretch(),
- @have_dasd ?
- HWeight(
- 1,
- PushButton(
- Id(:dasd),
- Opt(:hstretch),
- # push button
- _("Configure &DASD Disks")
- )
- ) :
- VSpacing(0),
- VSpacing(@have_dasd ? 2 : 0),
- @have_zfcp ?
- HWeight(
- 1,
- PushButton(
- Id(:zfcp),
- Opt(:hstretch),
- # push button
- _("Configure &ZFCP Disks")
- )
- ) :
- VSpacing(0),
- VSpacing(@have_zfcp ? 2 : 0),
- @want_fcoe ?
- HWeight(
- 1,
- PushButton(
- Id(:fcoe),
- Opt(:hstretch),
- # push button
- _("Configure &FCoE Interfaces")
- )
- ) :
- VSpacing(0),
- VSpacing(@want_fcoe ? 2 : 0),
- HWeight(
- 1,
- PushButton(
- Id(:iscsi),
- Opt(:hstretch),
- # push button
- _("Configure &iSCSI Disks")
- )
- ),
+ *dasd_part,
+ *zfcp_part,
+ *fcoe_part,
+ button_with_spacing(:iscsi, _("Configure &iSCSI Disks")),
+ button(:network, _("Change Net&work Configuration")),
VStretch()
),
HWeight(999, HStretch())
@@ -161,17 +130,21 @@
@disks_changed = false
while @ret == nil
@ret = UI.UserInput
- if @ret == :dasd
- @ret = WFM.call("inst_dasd")
+ case @ret
+ when :dasd
+ WFM.call("inst_dasd")
+ @ret = :redraw
+ when :zfcp
+ WFM.call("inst_zfcp")
@ret = :redraw
- elsif @ret == :zfcp
- @ret = WFM.call("inst_zfcp")
+ when :iscsi
+ WFM.call("inst_iscsi-client", [@argmap])
@ret = :redraw
- elsif @ret == :iscsi
- @ret = WFM.call("inst_iscsi-client", [@argmap])
+ when :fcoe
+ WFM.call("inst_fcoe-client", [@argmap])
@ret = :redraw
- elsif @ret == :fcoe
- @ret = WFM.call("inst_fcoe-client", [@argmap])
+ when :network
+ WFM.call("inst_lan", [@argmap])
@ret = :redraw
end
if @ret == :redraw
@@ -207,10 +180,24 @@
Builtins.y2milestone("Disk activation module finished")
Builtins.y2milestone("----------------------------------------")
- deep_copy(@ret)
+ @ret
+ end
+
+ private
+ def button(id, title)
+ HWeight(
+ 1,
+ PushButton(
+ Id(id),
+ Opt(:hstretch),
+ title
+ )
+ )
+ end
- # EOF
+ def button_with_spacing(id, title)
+ [ button(id, title), VSpacing(2) ]
end
def RestoreButtons(enable_back, enable_next)
@@ -227,8 +214,6 @@
else
Wizard.DisableNextButton
end
-
- nil
end
end
end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
