Mailinglist Archive: opensuse-commit (1093 mails)
| < Previous | Next > |
commit yast2-iscsi-client for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 23 Mar 2010 22:35:37 +0100
- Message-id: <20100323213537.92A5620246@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-iscsi-client for
openSUSE:Factory
checked in at Tue Mar 23 22:35:37 CET 2010.
--------
--- yast2-iscsi-client/yast2-iscsi-client.changes 2010-03-11
13:00:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-iscsi-client/yast2-iscsi-client.changes
2010-03-23 09:58:40.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 23 09:57:19 CET 2010 - mzugec@xxxxxxx
+
+- read iBFT before start daemon (bnc#573864)
+- 2.19.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-iscsi-client-2.19.2.tar.bz2
New:
----
yast2-iscsi-client-2.19.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.BTk57q/_old 2010-03-23 22:35:21.000000000 +0100
+++ /var/tmp/diff_new_pack.BTk57q/_new 2010-03-23 22:35:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-client (Version 2.19.2)
+# spec file for package yast2-iscsi-client (Version 2.19.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-iscsi-client
-Version: 2.19.2
+Version: 2.19.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-client-2.19.2.tar.bz2
+Source0: yast2-iscsi-client-2.19.3.tar.bz2
Prefix: /usr
@@ -46,7 +46,7 @@
client.
%prep
-%setup -n yast2-iscsi-client-2.19.2
+%setup -n yast2-iscsi-client-2.19.3
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-iscsi-client-2.19.2.tar.bz2 -> yast2-iscsi-client-2.19.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/VERSION
new/yast2-iscsi-client-2.19.3/VERSION
--- old/yast2-iscsi-client-2.19.2/VERSION 2010-03-11 12:57:50.000000000
+0100
+++ new/yast2-iscsi-client-2.19.3/VERSION 2010-03-23 09:56:58.000000000
+0100
@@ -1 +1 @@
-2.19.2
+2.19.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/iscsi-client.pot
new/yast2-iscsi-client-2.19.3/iscsi-client.pot
--- old/yast2-iscsi-client-2.19.2/iscsi-client.pot 2010-02-01
17:21:35.000000000 +0100
+++ new/yast2-iscsi-client-2.19.3/iscsi-client.pot 2010-03-23
09:58:15.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 17:21+0100\n"
+"POT-Creation-Date: 2010-03-23 09:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -86,7 +86,7 @@
msgid "Configuration summary..."
msgstr ""
-#: src/IscsiClientLib.ycp:315
+#: src/IscsiClientLib.ycp:333
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>
differ.\n"
"The old initiatorname will be replaced by the value of iBFT and create a
backup.\n"
@@ -330,7 +330,7 @@
#: src/helps.ycp:86
msgid ""
-"<p><b>InitiatorName</b> is value a from <tt>/etc/initiatorname.iscsi</tt>. \n"
+"<p><b>InitiatorName</b> is a value from
<tt>/etc/iscsi/initiatorname.iscsi</tt>. \n"
"In case you have iBFT, this value will be added from there and you are only
able to change it in the BIOS setup.</p>"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/src/IscsiClientLib.ycp
new/yast2-iscsi-client-2.19.3/src/IscsiClientLib.ycp
--- old/yast2-iscsi-client-2.19.2/src/IscsiClientLib.ycp 2010-03-03
10:44:49.000000000 +0100
+++ new/yast2-iscsi-client-2.19.3/src/IscsiClientLib.ycp 2010-03-23
09:56:49.000000000 +0100
@@ -414,41 +414,14 @@
return ret;
}
-/*
global boolean autoLogOn(){
y2milestone("begin of autoLogOn function");
- map<string, any> b = getiBFT();
-y2milestone("data read from iBFT card %1", b);
- if ( b != $[] ){
- y2milestone("checking size of %1 and %2", b["node.name"]:"",
b["node.conn[0].address"]:"");
- if (size(b["node.name"]:"")>0 && size(b["node.conn[0].address"]:"")>0){
- list <string> curr_rec = [sformat("%1:%2", b["node.conn[0].address"]:"",
b["node.conn[0].port"]:"3260"), b["node.name"]:""];
- y2milestone("variable curr_rec %1", curr_rec);
- if (connected( curr_rec , false) == false){
- y2milestone("in case not connected do discovery");
- // do discovery
- SCR::Execute(.target.bash, sformat("iscsiadm -m discovery -t st -p %1:%2",
b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260"));
-
- // do authentication if needed TODO: use NEW(iscsiadm -m fw) options
- if (size(b["iSCSI_TARGET_CHAP_NAME"]:"")>0 &&
size(b["iSCSI_TARGET_CHAP_PASSWORD"]:"")>0){
- y2milestone("do authentication with %1 and %2",
b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
- setValue(curr_rec, "node.session.auth.username",
b["iSCSI_TARGET_CHAP_NAME"]:"");
- setValue(curr_rec, "node.session.auth.password",
b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
- setValue(curr_rec, "node.session.auth.authmethod", "CHAP");
- } else y2internal("No authentication used for autoLogOn");
-
- // log on into target
- SCR::Execute(.target.bash, sformat("iscsiadm -m node -T %1 -p %2:%3 --login
", b["node.name"]:"", b["node.conn[0].address"]:"",
b["node.conn[0].port"]:"3260"));
-
- // set startup status to onboot
- y2milestone("set startup status to onboot");
- setStartupStatus(curr_rec, "onboot");
- } else y2error("Already connected, no autoLogOn needed");
- } else y2error("node.name or node.conn[0].address are not available.
Couldn't do autoLogOn");
+ if (size(getiBFT())>0){
+ y2milestone("Autologin into iBFT : %1", SCR::Execute(.target.bash_output,
"iscsiadm -m fw -l"));
}
return true;
}
-*/
+
global boolean loginIntoTarget(map target){
currentRecord = [target["portal"]:"", target["target"]:""];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-2.19.2/src/inst_iscsi-client.ycp
new/yast2-iscsi-client-2.19.3/src/inst_iscsi-client.ycp
--- old/yast2-iscsi-client-2.19.2/src/inst_iscsi-client.ycp 2010-02-09
13:20:21.000000000 +0100
+++ new/yast2-iscsi-client-2.19.3/src/inst_iscsi-client.ycp 2010-03-23
09:57:34.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Michal Zugec <mzugec@xxxxxxx>
*
- * $Id: inst_iscsi-client.ycp 60759 2010-02-09 12:20:20Z mzugec $
+ * $Id: inst_iscsi-client.ycp 61441 2010-03-23 08:57:32Z mzugec $
*
* Main file for iscsi-client configuration. Uses all other files.
*/
@@ -40,12 +40,12 @@
IscsiClientLib::checkInitiatorName();
+IscsiClientLib::getiBFT();
ModuleLoading::Load("iscsi_tcp", "", "", "", false, true);
-// start daemon before
+// start iscsid daemon
IscsiClientLib::startIScsid();
-//if (size(IscsiClientLib::getiBFT())>0) IscsiClientLib::autoLogOn();
-IscsiClientLib::getiBFT();
+IscsiClientLib::autoLogOn();
// run dialog
ret = MainSequence();
y2debug("MainSequence ret=%1", ret);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |