Hello community,
here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2011-10-27 14:03:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client", Maintainer is "fehr@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes 2011-10-21 16:48:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2011-10-28 15:32:50.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Oct 27 11:41:58 CEST 2011 - fehr@suse.de
+
+- 2.21.8
+- adapt to changed name of start scripts open-iscsi -> iscsid
+ (bnc#661401)
+
+-------------------------------------------------------------------
+Wed Oct 26 15:26:38 CEST 2011 - fehr@suse.de
+
+- adapt to changed output of iscsi_offload script (bnc#725833)
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-2.21.7.tar.bz2
New:
----
yast2-iscsi-client-2.21.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.IyTtiN/_old 2011-10-28 15:32:58.000000000 +0200
+++ /var/tmp/diff_new_pack.IyTtiN/_new 2011-10-28 15:32:58.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-iscsi-client
-Version: 2.21.7
+Version: 2.21.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-client-2.21.7.tar.bz2
+Source0: yast2-iscsi-client-2.21.8.tar.bz2
Prefix: /usr
@@ -47,7 +47,7 @@
client.
%prep
-%setup -n yast2-iscsi-client-2.21.7
+%setup -n yast2-iscsi-client-2.21.8
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-iscsi-client-2.21.7.tar.bz2 -> yast2-iscsi-client-2.21.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.7/VERSION new/yast2-iscsi-client-2.21.8/VERSION
--- old/yast2-iscsi-client-2.21.7/VERSION 2011-10-20 15:06:03.000000000 +0200
+++ new/yast2-iscsi-client-2.21.8/VERSION 2011-10-27 12:18:00.000000000 +0200
@@ -1 +1 @@
-2.21.7
+2.21.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.7/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.21.8/src/IscsiClientLib.ycp
--- old/yast2-iscsi-client-2.21.7/src/IscsiClientLib.ycp 2011-10-20 15:05:25.000000000 +0200
+++ new/yast2-iscsi-client-2.21.8/src/IscsiClientLib.ycp 2011-10-27 12:48:43.000000000 +0200
@@ -18,7 +18,7 @@
map iface_file = $[];
list<string> iface_eth = [];
-// status of rcopen-iscsi service
+// status of rciscsid service
boolean serviceStatus = false;
// main configuration file (/etc/iscsi/iscsid.conf)
map config = $[];
@@ -95,20 +95,20 @@
// get accessor for service status
global boolean GetStartService() {
- boolean status = Service::Enabled("open-iscsi");
- y2milestone("Status of open-iscsi %1", status);
+ boolean status = Service::Enabled("iscsid");
+ y2milestone("Status of iscsid %1", status);
return status;
}
// set accessor for service status
global void SetStartService(boolean status) {
- y2milestone("Set status of open-iscsi to %1", status);
+ y2milestone("Set status of iscsid to %1", status);
if (status == true) {
- Service::Enable("boot.open-iscsi");
- Service::Enable("open-iscsi");
+ Service::Enable("boot.iscsid-early");
+ Service::Enable("iscsid");
} else {
- Service::Disable("boot.open-iscsi");
- Service::Disable("open-iscsi");
+ Service::Disable("boot.iscsid-early");
+ Service::Disable("iscsid");
}
}
@@ -330,7 +330,7 @@
y2milestone("Initiatorname %1 written", initiatorname);
}
// reload service when initiatorname is changed to re-read new value (bnc#482429)
- Service::Reload("open-iscsi");
+ Service::Reload("iscsid");
return ret;
}
@@ -518,7 +518,7 @@
}
-// get status of open-iscsi
+// get status of iscsid
global boolean getServiceStatus(){
boolean ret = true;
if (Stage::initial()){
@@ -527,15 +527,15 @@
startIScsid();
} else {
- if (Service::Status("open-iscsi") == 0) serviceStatus=true;
+ if (Service::Status("iscsid") == 0) serviceStatus=true;
y2milestone("Service status = %1", serviceStatus);
// if not enabled, start it manually
- if (!serviceStatus) Service::Start("open-iscsi");
+ if (!serviceStatus) Service::Start("iscsid");
}
return ret;
}
-// set startup status of open-iscsi
+// set startup status of iscsid
global boolean setServiceStatus(){
boolean ret = true;
// if disabled and no connected targets - stop it
@@ -544,10 +544,10 @@
readSessions();
if (size(sessions)==0) {
y2milestone("No active sessions - stopping service");
- Service::Stop("open-iscsi");
+ Service::Stop("iscsid");
}
}
- y2milestone("Status service for open-iscsi: %1", ret);
+ y2milestone("Status service for iscsid: %1", ret);
return ret;
}
@@ -709,7 +709,7 @@
{
offload_valid[i] = filter( list l, (list<list>)eth,
{
- cmd = offboard_script + " " + l[0]:"";
+ cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:..";
y2milestone( "GetOffloadItems cmd:%1", cmd );
map out = (map) SCR::Execute (.target.bash_output, cmd );
y2milestone( "GetOffloadItems iscsi_offload out:%1", out );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.7/src/inst_iscsi-client.ycp new/yast2-iscsi-client-2.21.8/src/inst_iscsi-client.ycp
--- old/yast2-iscsi-client-2.21.7/src/inst_iscsi-client.ycp 2011-10-20 15:06:40.000000000 +0200
+++ new/yast2-iscsi-client-2.21.8/src/inst_iscsi-client.ycp 2011-10-27 12:17:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Michal Zugec
*
- * $Id: inst_iscsi-client.ycp 66506 2011-10-20 13:06:39Z fehr $
+ * $Id: inst_iscsi-client.ycp 66615 2011-10-27 10:17:53Z fehr $
*
* Main file for iscsi-client configuration. Uses all other files.
*/
@@ -33,7 +33,7 @@
/* main ui function */
any ret = nil;
-y2milestone("start open-iscsi");
+y2milestone("start iscsid");
SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi");
// check initiator name, create if not exists
//WFM::Execute (.local.bash,"test -d /etc/iscsi/ && /bin/cp -a /etc/iscsi/* " + String::Quote(Installation::destdir) + "/etc/iscsi/");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.7/src/iscsi-client_finish.ycp new/yast2-iscsi-client-2.21.8/src/iscsi-client_finish.ycp
--- old/yast2-iscsi-client-2.21.7/src/iscsi-client_finish.ycp 2011-03-08 17:13:28.000000000 +0100
+++ new/yast2-iscsi-client-2.21.8/src/iscsi-client_finish.ycp 2011-10-27 12:48:52.000000000 +0200
@@ -49,9 +49,9 @@
// write open-iscsi database of automatic connected targets
WFM::Execute (.local.bash,"test -d /etc/iscsi/ && mkdir -p '" + String::Quote(Installation::destdir) + "/etc/iscsi' && cp -a /etc/iscsi/* '" + String::Quote(Installation::destdir) + "/etc/iscsi/'");
if ( size(IscsiClientLib::sessions)>0 ){
- Service::Enable("boot.open-iscsi");
- Service::Enable("open-iscsi");
- y2milestone("open-iscsi service enabled");
+ Service::Enable("boot.iscsid-early");
+ Service::Enable("iscsid");
+ y2milestone("iscsid service enabled");
}
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.7/src/widgets.ycp new/yast2-iscsi-client-2.21.8/src/widgets.ycp
--- old/yast2-iscsi-client-2.21.7/src/widgets.ycp 2011-07-12 17:47:44.000000000 +0200
+++ new/yast2-iscsi-client-2.21.8/src/widgets.ycp 2011-10-27 11:45:24.000000000 +0200
@@ -296,7 +296,7 @@
SCR::Execute(.target.bash, "killproc /sbin/iscsid");
IscsiClientLib::startIScsid();
}
- else SCR::Execute(.target.bash, "rcopen-iscsi restart");
+ else SCR::Execute(.target.bash, "rciscsid restart");
y2milestone("write initiatorname %1", IscsiClientLib::initiatorname);
}
if ((string)UI::QueryWidget(`offload_card, `Value) != IscsiClientLib::GetOffloadCard()){
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.7/testsuite/tests/GetSetServiceStatus.out new/yast2-iscsi-client-2.21.8/testsuite/tests/GetSetServiceStatus.out
--- old/yast2-iscsi-client-2.21.7/testsuite/tests/GetSetServiceStatus.out 2011-09-21 13:33:32.000000000 +0200
+++ new/yast2-iscsi-client-2.21.8/testsuite/tests/GetSetServiceStatus.out 2011-10-27 12:50:42.000000000 +0200
@@ -1,15 +1,15 @@
Read .target.tmpdir "/tmp"
-Read .target.stat "/etc/init.d/open-iscsi" $["isreg":true]
-Execute .target.bash "/sbin/chkconfig -l open-iscsi | /usr/bin/grep -q '[0-6]:on'" 0
+Read .target.stat "/etc/init.d/iscsid" $["isreg":true]
+Execute .target.bash "/sbin/chkconfig -l iscsid | /usr/bin/grep -q '[0-6]:on'" 0
Return true
-Read .target.stat "/etc/init.d/boot.open-iscsi" $["isreg":true]
-Read .target.stat "/etc/init.d/boot.open-iscsi" $["isreg":true]
-Read .target.stat "/etc/init.d/boot.open-iscsi" $["isreg":true]
-Read .init.scripts.runlevel "boot.open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]]
-Read .init.scripts.comment "boot.open-iscsi" $["boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]]
-Read .target.stat "/etc/init.d/open-iscsi" $["isreg":true]
-Read .target.stat "/etc/init.d/open-iscsi" $["isreg":true]
-Read .target.stat "/etc/init.d/open-iscsi" $["isreg":true]
-Read .init.scripts.runlevel "open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]]
-Read .init.scripts.comment "open-iscsi" $["boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]]
+Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true]
+Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true]
+Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true]
+Read .init.scripts.runlevel "boot.iscsid-early" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]]
+Read .init.scripts.comment "boot.iscsid-early" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]]
+Read .target.stat "/etc/init.d/iscsid" $["isreg":true]
+Read .target.stat "/etc/init.d/iscsid" $["isreg":true]
+Read .target.stat "/etc/init.d/iscsid" $["isreg":true]
+Read .init.scripts.runlevel "iscsid" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]]
+Read .init.scripts.comment "iscsid" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]]
Return nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.7/testsuite/tests/GetSetServiceStatus.ycp new/yast2-iscsi-client-2.21.8/testsuite/tests/GetSetServiceStatus.ycp
--- old/yast2-iscsi-client-2.21.7/testsuite/tests/GetSetServiceStatus.ycp 2011-09-21 13:33:32.000000000 +0200
+++ new/yast2-iscsi-client-2.21.8/testsuite/tests/GetSetServiceStatus.ycp 2011-10-27 12:49:49.000000000 +0200
@@ -9,8 +9,8 @@
"init" :$[
"scripts" :$[
"exists" : true,
- "runlevel" : $[ "open-iscsi":$["start":["3","5"], "stop":["3", "5"]], "boot.open-iscsi":$["start":["B"], "stop":[]] ],
- "comment" : $["open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]], "boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]]],
+ "runlevel" : $[ "iscsid":$["start":["3","5"], "stop":["3", "5"]], "boot.iscsid-early":$["start":["B"], "stop":[]] ],
+ "comment" : $["iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]], "boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]]],
]
]
];
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org