Hello community,
here is the log from the commit of package yast2-iscsi-client
checked in at Tue Apr 17 00:28:55 CEST 2007.
--------
--- yast2-iscsi-client/yast2-iscsi-client.changes 2007-03-26 12:54:22.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-iscsi-client/yast2-iscsi-client.changes 2007-04-16 17:59:18.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 16 18:06:01 CEST 2007 - mzugec@suse.cz
+
+- bugfix for checkInitiatorname (#264818)
+- 2.14.10
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-2.14.9.tar.bz2
New:
----
yast2-iscsi-client-2.14.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.P22671/_old 2007-04-17 00:28:45.000000000 +0200
+++ /var/tmp/diff_new_pack.P22671/_new 2007-04-17 00:28:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-client (Version 2.14.9)
+# spec file for package yast2-iscsi-client (Version 2.14.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-iscsi-client
-Version: 2.14.9
+Version: 2.14.10
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-client-2.14.9.tar.bz2
+Source0: yast2-iscsi-client-2.14.10.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-packager
@@ -29,7 +29,7 @@
%prep
-%setup -n yast2-iscsi-client-2.14.9
+%setup -n yast2-iscsi-client-2.14.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -65,6 +65,9 @@
%doc %{prefix}/share/doc/packages/yast2-iscsi-client
%changelog
+* Mon Apr 16 2007 - mzugec@suse.cz
+- bugfix for checkInitiatorname (#264818)
+- 2.14.10
* Mon Mar 26 2007 - mzugec@suse.cz
- auto log on when needed parameters read from iBFT card (#256227)
- 2.14.9
++++++ yast2-iscsi-client-2.14.9.tar.bz2 -> yast2-iscsi-client-2.14.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.9/configure new/yast2-iscsi-client-2.14.10/configure
--- old/yast2-iscsi-client-2.14.9/configure 2007-03-26 12:56:06.000000000 +0200
+++ new/yast2-iscsi-client-2.14.10/configure 2007-04-16 18:03:44.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-iscsi-client 2.14.8.
+# Generated by GNU Autoconf 2.60 for yast2-iscsi-client 2.14.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-iscsi-client'
PACKAGE_TARNAME='yast2-iscsi-client'
-PACKAGE_VERSION='2.14.8'
-PACKAGE_STRING='yast2-iscsi-client 2.14.8'
+PACKAGE_VERSION='2.14.9'
+PACKAGE_STRING='yast2-iscsi-client 2.14.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-iscsi-client 2.14.8 to adapt to many kinds of systems.
+\`configure' configures yast2-iscsi-client 2.14.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-iscsi-client 2.14.8:";;
+ short | recursive ) echo "Configuration of yast2-iscsi-client 2.14.9:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-iscsi-client configure 2.14.8
+yast2-iscsi-client configure 2.14.9
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-iscsi-client $as_me 2.14.8, which was
+It was created by yast2-iscsi-client $as_me 2.14.9, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-iscsi-client'
- VERSION='2.14.8'
+ VERSION='2.14.9'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.14.8"
+VERSION="2.14.9"
RPMNAME="yast2-iscsi-client"
MAINTAINER="Michal Zugec "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-iscsi-client $as_me 2.14.8, which was
+This file was extended by yast2-iscsi-client $as_me 2.14.9, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-iscsi-client config.status 2.14.8
+yast2-iscsi-client config.status 2.14.9
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.9/configure.in new/yast2-iscsi-client-2.14.10/configure.in
--- old/yast2-iscsi-client-2.14.9/configure.in 2007-03-26 12:56:02.000000000 +0200
+++ new/yast2-iscsi-client-2.14.10/configure.in 2007-04-16 18:03:39.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-client, 2.14.8, http://bugs.opensuse.org/, yast2-iscsi-client)
+AC_INIT(yast2-iscsi-client, 2.14.9, http://bugs.opensuse.org/, yast2-iscsi-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.8"
+VERSION="2.14.9"
RPMNAME="yast2-iscsi-client"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.9/src/inst_iscsi-client.ycp new/yast2-iscsi-client-2.14.10/src/inst_iscsi-client.ycp
--- old/yast2-iscsi-client-2.14.9/src/inst_iscsi-client.ycp 2007-02-14 19:05:09.000000000 +0100
+++ new/yast2-iscsi-client-2.14.10/src/inst_iscsi-client.ycp 2007-04-16 18:06:43.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Michal Zugec
*
- * $Id: inst_iscsi-client.ycp 35947 2007-02-07 15:20:40Z mzugec $
+ * $Id: inst_iscsi-client.ycp 37497 2007-04-16 16:03:13Z mzugec $
*
* Main file for iscsi-client configuration. Uses all other files.
*/
@@ -34,6 +34,7 @@
any ret = nil;
y2milestone("start open-iscsi");
+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/");
IscsiClient::checkInitiatorName();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.9/src/iscsi-client.desktop new/yast2-iscsi-client-2.14.10/src/iscsi-client.desktop
--- old/yast2-iscsi-client-2.14.9/src/iscsi-client.desktop 2007-02-14 19:05:09.000000000 +0100
+++ new/yast2-iscsi-client-2.14.10/src/iscsi-client.desktop 2007-03-29 09:37:22.000000000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
X-KDE-ModuleType=Library
X-KDE-RootOnly=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.9/src/IscsiClient.ycp new/yast2-iscsi-client-2.14.10/src/IscsiClient.ycp
--- old/yast2-iscsi-client-2.14.9/src/IscsiClient.ycp 2007-03-26 12:59:30.000000000 +0200
+++ new/yast2-iscsi-client-2.14.10/src/IscsiClient.ycp 2007-04-16 18:06:43.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: IscsiClient settings, input and output functions
* Authors: Michal Zugec
*
- * $Id: IscsiClient.ycp 37109 2007-03-26 10:56:25Z mzugec $
+ * $Id: IscsiClient.ycp 37497 2007-04-16 16:03:13Z mzugec $
*
* Representation of the configuration of iscsi-client.
* Input and output routines.
@@ -268,9 +268,9 @@
string name_from_bios = getiBFT()["iSCSI_INITIATOR_NAME"]:"";
y2milestone("Check %1", file);
- if (size((map)SCR::Read (.target.lstat, file)) == 0){
+ if (size((map)SCR::Read (.target.lstat, file)) == 0 || ((map)SCR::Read (.target.lstat, file))["size"]:0==0){
if (size(name_from_bios)>0){
- y2milestone("/etc/initiatorname.iscsi is empty or doesnt exists - replace with name stored in iBFT");
+ y2milestone("%1 is empty or doesnt exists - replace with name stored in iBFT", file);
initiatorname = name_from_bios;
} else {
y2milestone("%1 not exist, create", file);
@@ -354,6 +354,7 @@
// check if given target is connected
global boolean connected(list<string> rec, boolean check_ip){
+y2internal("check connected status for %1 with IP check:%2", rec, check_ip);
boolean ret = false;
foreach(string row, sessions, {
list<string> list_row = splitstring(row, " ");
@@ -376,26 +377,32 @@
}
boolean autoLogOn(){
+y2internal("begin of autoLogOn function");
map b = getiBFT();
+y2internal("data read from iBFT card %1", b);
if ( b != $[] ){
+y2internal("checking size of %1 and %2", b["iSCSI_TARGET_NAME"]:"", b["iSCSI_TARGET_IPADDR"]:"");
if (size(b["iSCSI_TARGET_NAME"]:"")>0 && size(b["iSCSI_TARGET_IPADDR"]:"")>0){
list <string> curr_rec = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""];
+y2internal("variable curr_rec %1", curr_rec);
if (connected( curr_rec , false) == false){
-
+y2internal("in case not connected do discovery");
// do discovery
SCR::Execute(.target.bash, sformat("iscsiadm -m discovery -t st -p %1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"));
// do authentication if needed
if (size(b["iSCSI_TARGET_CHAP_NAME"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD"]:"")>0){
+y2internal("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 y2milestone("No authentication used for autoLogOn");
+ } 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["iSCSI_TARGET_NAME"]:"", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"));
// set startup status to automatic
+y2internal("set startup status to automatic");
setStartupStatus(curr_rec, "automatic");
} else y2error("Already connected, no autoLogOn needed");
} else y2error("iSCSI_TARGET_NAME or iSCSI_TARGET_IPADDR are not available. Couldn't do autoLogOn");
@@ -492,13 +499,16 @@
sleep(sl);
// read config file
+y2internal("before readSessions() function");
if(readSessions()==false)
{
Report::Error( Message::CannotReadCurrentSettings() );
return false;
}
sleep(sl);
+y2internal("after readSessions() function");
+y2internal("before autoLogOn function");
// read current settings
if(!autoLogOn()) return false;
Progress::NextStage();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.9/src/widgets.ycp new/yast2-iscsi-client-2.14.10/src/widgets.ycp
--- old/yast2-iscsi-client-2.14.9/src/widgets.ycp 2007-03-21 11:04:17.000000000 +0100
+++ new/yast2-iscsi-client-2.14.10/src/widgets.ycp 2007-04-16 18:01:31.000000000 +0200
@@ -116,16 +116,6 @@
return record;
}
-list<string> parseOutput(string row){
-// list<string> output=[];
- list<string> tmplist=splitstring(row, " ");
- if (size(tmplist)==2) return [tmplist[0]:"", tmplist[1]:""];
- else return [tmplist[1]:"", tmplist[2]:""];
-// return [];
-}
-
-
-
// handle for table of connected sessions
symbol handleConnectedTable (string key, map event){
if (event["EventReason"]:"" == "Activated"){
@@ -203,7 +193,8 @@
if (Stage::initial()){
SCR::Execute(.target.bash, "killproc /sbin/iscsid");
SCR::Execute(.background.run_output_err, "iscsid");
- } else SCR::Execute(.target.bash, "rcopen-iscsi restart");
+ }
+ else SCR::Execute(.target.bash, "rcopen-iscsi restart");
y2milestone("write initiatorname %1", IscsiClient::initiatorname);
}
return nil;
@@ -334,8 +325,8 @@
list<string>trg_list = runInBg( sformat("iscsiadm -m discovery -t st -p %1:%2", ip, port) );
IscsiClient::targets = [];
foreach(string row, trg_list, {
- list<string> tmp_list=parseOutput(row);
- if (issubstring(tmp_list[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[0]:"", tmp_list[1]:""));
+ list<string> tmp_list=splitstring(row, " ");
+ if (issubstring(tmp_list[1]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[1]:"", tmp_list[2]:""));
});
while(!bg_finish){};
// restore old config
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.9/VERSION new/yast2-iscsi-client-2.14.10/VERSION
--- old/yast2-iscsi-client-2.14.9/VERSION 2007-03-26 12:58:45.000000000 +0200
+++ new/yast2-iscsi-client-2.14.10/VERSION 2007-04-16 18:05:59.000000000 +0200
@@ -1 +1 @@
-2.14.9
+2.14.10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org