Hello community,
here is the log from the commit of package yast2-iscsi-client for
openSUSE:Factory checked in at 2014-06-18 10:59:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes
2014-06-10 14:37:50.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes
2014-06-18 10:59:38.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Jun 11 14:50:01 CEST 2014 - [email protected]
+
+- allow AutoYaST installation on iSCSI disks with BIOS boot support
+ (bnc #878061)
+- 3.1.12
+
+-------------------------------------------------------------------
+Tue Jun 10 15:00:18 CEST 2014 - [email protected]
+
+- ensure installation of package 'iscsiuio', start 'isciuio' service
+ resp. socket (bnc #874795, bnc #881543)
+- 3.1.11
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-3.1.10.tar.bz2
New:
----
yast2-iscsi-client-3.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.sLvCHn/_old 2014-06-18 10:59:39.000000000 +0200
+++ /var/tmp/diff_new_pack.sLvCHn/_new 2014-06-18 10:59:39.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.10
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,6 +49,7 @@
BuildArch: noarch
+Requires: iscsiuio
Requires: open-iscsi
Requires: yast2-ruby-bindings >= 3.1.7
++++++ yast2-iscsi-client-3.1.10.tar.bz2 -> yast2-iscsi-client-3.1.12.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.10/package/yast2-iscsi-client.changes
new/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-3.1.10/package/yast2-iscsi-client.changes
2014-06-05 10:08:34.000000000 +0200
+++ new/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.changes
2014-06-12 11:43:48.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Wed Jun 11 14:50:01 CEST 2014 - [email protected]
+
+- allow AutoYaST installation on iSCSI disks with BIOS boot support
+ (bnc #878061)
+- 3.1.12
+
+-------------------------------------------------------------------
+Tue Jun 10 15:00:18 CEST 2014 - [email protected]
+
+- ensure installation of package 'iscsiuio', start 'isciuio' service
+ resp. socket (bnc #874795, bnc #881543)
+- 3.1.11
+
+-------------------------------------------------------------------
Wed Jun 4 13:18:11 CEST 2014 - [email protected]
- mark offload card values for translation (bnc #877920)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.10/package/yast2-iscsi-client.spec
new/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-3.1.10/package/yast2-iscsi-client.spec
2014-06-05 10:08:34.000000000 +0200
+++ new/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.spec
2014-06-12 11:43:48.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.10
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,6 +42,7 @@
Requires: yast2-ruby-bindings >= 3.1.7
Requires: open-iscsi
+Requires: iscsiuio
Summary: YaST2 - iSCSI Client Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.10/src/clients/inst_iscsi-client.rb
new/yast2-iscsi-client-3.1.12/src/clients/inst_iscsi-client.rb
--- old/yast2-iscsi-client-3.1.10/src/clients/inst_iscsi-client.rb
2014-06-05 10:08:34.000000000 +0200
+++ new/yast2-iscsi-client-3.1.12/src/clients/inst_iscsi-client.rb
2014-06-12 11:43:48.000000000 +0200
@@ -47,9 +47,10 @@
Yast.import "Report"
Yast.import "Summary"
Yast.import "ModuleLoading"
- Yast.import "Packages"
+ Yast.import "PackagesProposal"
Yast.import "Installation"
Yast.import "String"
+ Yast.import "Mode"
Yast.include self, "iscsi-client/wizards.rb"
# main ui function
@@ -70,15 +71,29 @@
ModuleLoading.Load("iscsi_tcp", "", "", "", false, true)
IscsiClientLib.LoadOffloadModules
- # start iscsid daemon
+ # start iscsid daemon and service 'iscsiuio'
IscsiClientLib.startIScsid
+ # try auto login to target
+ auto_login = IscsiClientLib.autoLogOn
+
+ # add package open-iscsi and iscsiuio to installed system
+ iscsi_packages = ["open-iscsi", "iscsiuio"]
+ Builtins.y2milestone("Additional packages to be installed: %1",
+ iscsi_packages)
+ PackagesProposal.AddResolvables(
+ "iscsi-client",
+ :package,
+ iscsi_packages
+ )
+
+ if Mode.autoinst && auto_login
+ Builtins.y2milestone("Autoinstallation - IscsiClient module finished")
+ return :next
+ end
- IscsiClientLib.autoLogOn
# run dialog
@ret = MainSequence()
Builtins.y2debug("MainSequence ret=%1", @ret)
- # add package open-iscsi to installed system
- Packages.addAdditionalPackage("open-iscsi")
# Finish
Builtins.y2milestone("IscsiClient module finished")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.10/src/clients/iscsi-client_finish.rb
new/yast2-iscsi-client-3.1.12/src/clients/iscsi-client_finish.rb
--- old/yast2-iscsi-client-3.1.10/src/clients/iscsi-client_finish.rb
2014-06-05 10:08:34.000000000 +0200
+++ new/yast2-iscsi-client-3.1.12/src/clients/iscsi-client_finish.rb
2014-06-12 11:43:48.000000000 +0200
@@ -94,6 +94,10 @@
# enable iscsi and iscsid service
Service.Enable("iscsid")
Service.Enable("iscsi")
+ Builtins.y2milestone("enabling iscsiuio socket and service")
+ socket = SystemdSocket.find("iscsiuio")
+ socket.enable if socket
+ Service.Enable("iscsiuio")
end
else
Builtins.y2error("unknown function: %1", @func)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.10/src/include/iscsi-client/widgets.rb
new/yast2-iscsi-client-3.1.12/src/include/iscsi-client/widgets.rb
--- old/yast2-iscsi-client-3.1.10/src/include/iscsi-client/widgets.rb
2014-06-05 10:08:34.000000000 +0200
+++ new/yast2-iscsi-client-3.1.12/src/include/iscsi-client/widgets.rb
2014-06-12 11:43:48.000000000 +0200
@@ -468,8 +468,8 @@
def handleOffload(key, event)
event = deep_copy(event)
- if Ops.get_string(event, "EventReason", "") == "ValueChanged" &&
- Ops.get_symbol(event, "ID", :none) == :offload_card
+ if event["EventReason"] || "" == "ValueChanged" &&
+ event["ID"] || :none == :offload_card
if Convert.to_string(UI.QueryWidget(:offload_card, :Value)) !=
IscsiClientLib.GetOffloadCard
IscsiClientLib.SetOffloadCard(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-3.1.10/src/modules/IscsiClient.rb
new/yast2-iscsi-client-3.1.12/src/modules/IscsiClient.rb
--- old/yast2-iscsi-client-3.1.10/src/modules/IscsiClient.rb 2014-06-05
10:08:34.000000000 +0200
+++ new/yast2-iscsi-client-3.1.12/src/modules/IscsiClient.rb 2014-06-12
11:43:48.000000000 +0200
@@ -308,7 +308,7 @@
# installed.
# @return [Hash] with 2 lists.
def AutoPackages
- { "install" => ["open-iscsi"], "remove" => [] }
+ { "install" => ["open-iscsi", "iscsiuio"], "remove" => [] }
end
publish :variable => :configured, :type => "boolean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.10/src/modules/IscsiClientLib.rb
new/yast2-iscsi-client-3.1.12/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-3.1.10/src/modules/IscsiClientLib.rb 2014-06-05
10:08:34.000000000 +0200
+++ new/yast2-iscsi-client-3.1.12/src/modules/IscsiClientLib.rb 2014-06-12
11:43:48.000000000 +0200
@@ -50,9 +50,11 @@
@iface_eth = []
# status of iscsi.service
- @serviceStatus = false
+ @iscsi_service_stat = false
# status of iscsid.socket
- @socketStatus = false
+ @iscsid_socket_stat = false
+ # status of iscsiuio.socket
+ @iscsiuio_socket_stat = false
# main configuration file (/etc/iscsi/iscsid.conf)
@config = {}
# iBFT (iSCSI Boot Firmware Table)
@@ -84,67 +86,68 @@
@offload_valid = nil
@iscsid_socket = nil
+ @iscsiuio_socket = nil
end
- def iscsidSocketActive?
- if @iscsid_socket
- @iscsid_socket.active?
+ def socketActive?(socket)
+ if socket
+ socket.active?
else
- log.error("iscsid.socket not found")
+ log.error "socket not available"
false
end
end
- def iscsidSocketStart
- if @iscsid_socket
- @iscsid_socket.start
+ def socketStart(socket)
+ if socket
+ socket.start
else
- log.error("iscsid.socket not found")
+ log.error "socket not available"
false
end
end
- def iscsidSocketStop
- if @iscsid_socket
- @iscsid_socket.stop
+ def socketStop(socket)
+ if socket
+ socket.stop
else
- log.error("iscsid.socket not found")
+ log.error "socket not available"
false
end
end
- def iscsidSocketEnabled?
- if @iscsid_socket
- @iscsid_socket.enabled?
+ def socketEnabled?(socket)
+ if socket
+ socket.enabled?
else
- log.error("iscsid.socket not found")
+ log.error "socket not available"
false
end
end
- def iscsidSocketDisabled?
- if @iscsid_socket
- @iscsid_socket.disabled?
+ def socketDisabled?(socket)
+ if socket
+ socket.disabled?
else
- log.error("iscsid.socket not found")
+ log.error "socket not available"
false
end
end
- def iscsidSocketEnable
- if @iscsid_socket
- @iscsid_socket.enable
+ def socketEnable(socket)
+ if socket
+ socket.enable
else
- log.error("iscsid.socket not found")
+ log.error "socket not available"
false
end
end
- def iscsidSocketDisable
- if @iscsid_socket
- @iscsid_socket.disable
+ def socketDisable(socket)
+ if socket
+ socket.disable
else
- log.error("iscsid.socket not found")
+ log.error "socket not available"
false
end
end
@@ -231,22 +234,24 @@
# get accessor for service status
def GetStartService
- status_d = iscsidSocketEnabled?
+ status_d = socketEnabled?(@iscsid_socket)
+ status_uio = socketEnabled?(@iscsiuio_socket)
status = Service.Enabled("iscsi")
- Builtins.y2milestone("Start at boot enabled for iscsid.socket: %1,
iscsi: %2", status_d, status)
- return status_d && status
+ log.info "Start at boot enabled for iscsid.socket: #{status_d}, iscsi:
#{status}, iscsiuio.socket: #{status_uio}"
+ return status_d && status && status_uio
end
# set accessor for service status
def SetStartService(status)
- Builtins.y2milestone("Set start at boot for iscsid.socket and
iscsi.service to %1",
- status)
+ log.info "Set start at boot for iscsid.socket, iscsiuio.socket and
iscsi.service to #{status}"
if status == true
Service.Enable("iscsi")
- iscsidSocketEnable
+ socketEnable(@iscsid_socket)
+ socketEnable(@iscsiuio_socket)
else
Service.Disable("iscsi")
- iscsidSocketDisable
+ socketDisable(@iscsid_socket)
+ socketDisable(@iscsiuio_socket)
end
nil
@@ -506,6 +511,8 @@
raise Break
end
end
+ # start service 'iscsiuio'
+ Service.Start("iscsiuio")
nil
end
@@ -918,14 +925,17 @@
end
def autoLogOn
+ ret = true
Builtins.y2milestone("begin of autoLogOn function")
if Ops.greater_than(Builtins.size(getiBFT), 0)
- Builtins.y2milestone(
- "Autologin into iBFT : %1",
- SCR.Execute(path(".target.bash_output"), GetAdmCmd("-m fw -l"))
- )
+ result = Convert.to_map(SCR.Execute(path(".target.bash_output"),
+ GetAdmCmd("-m fw -l")))
+ if result["exit"] || 255 != 0
+ ret = false
+ end
+ log.info "Autologin into iBFT : #{result}"
end
- true
+ ret
end
@@ -998,21 +1008,28 @@
# start daemon manually (systemd not available in inst-sys)
startIScsid
else
- # find socket (only in installed system)
+ # find sockets (only in installed system)
# throw exception if socket not found
@iscsid_socket = SystemdSocket.find!("iscsid")
+ @iscsiuio_socket = SystemdSocket.find!("iscsiuio")
+
+ @iscsi_service_stat = Service.active?("iscsi")
+ @iscsid_socket_stat = socketActive?(@iscsid_socket)
+ @iscsiuio_socket_stat = socketActive?(@iscsiuio_socket)
- @serviceStatus = true if Service.Status("iscsi") == 0
- @socketStatus = true if iscsidSocketActive?
- Builtins.y2milestone("Status of iscsi.service = %1 iscsid.socket = %2",
- @serviceStatus, @socketStatus)
- # if not running, start iscsi.service and iscsid.socket
- if !@socketStatus
- Service.Stop("iscsid") if Service.Status("iscsid") == 0
- Builtins.y2error("Cannot start iscsid.socket") if !iscsidSocketStart
+ log.info "Status of iscsi.service: #{@iscsi_service_stat},
iscsid.socket: #{@iscsid_socket_stat}, iscsiuio.socket:
#{@iscsiuio_socket_stat}"
+
+ # if not running, start iscsi.service, iscsid.socket and
iscsiuio.socket
+ if !@iscid_socket_stat
+ Service.Stop("iscsid") if Service.active?("iscsid")
+ log.error "Cannot start iscsid.socket" if
!socketStart(@iscsid_socket)
+ end
+ if !@iscsiuio_socket_stat
+ Service.Stop("iscsiuio") if Service.active?("iscsiuio")
+ log.error "Cannot start iscsiuio.socket" if
!socketStart(@iscsiuio_socket)
end
- if !@serviceStatus && !Service.Start("iscsi")
- Builtins.y2error("Cannot start iscsi.service")
+ if !@iscsi_service_stat && !Service.Start("iscsi")
+ log.error "Cannot start iscsi.service"
end
end
ret
@@ -1028,16 +1045,19 @@
if !GetStartService()
readSessions
if Builtins.size(@sessions) == 0
- Builtins.y2milestone("No active sessions - stopping iscsi
- service and iscsid service/socket")
+ log.info "No active sessions - stopping iscsi service and
iscsid/iscsiuio service and socket"
# stop iscsid.socket and iscsid.service
- iscsidSocketStop
+ socketStop(@iscsid_socket)
Service.Stop("iscsid")
+ # stop iscsiuio.socket and iscsiuio.service
+ socketStop(@iscsiuio_socket)
+ Service.Stop("iscsiuio")
+ # stop iscsi.service
Service.Stop("iscsi")
end
end
end
- Builtins.y2milestone("Status service for iscsid: %1", ret)
+ log.info "Status service for iscsid: #{ret}"
ret
end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
