Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit yast2-iscsi-client
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 27 Mar 2007 01:25:44 +0200
  • Message-id: <20070326232545.472C367817D@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-iscsi-client
checked in at Tue Mar 27 01:25:44 CEST 2007.

--------
--- yast2-iscsi-client/yast2-iscsi-client.changes       2007-03-12 15:17:09.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-iscsi-client/yast2-iscsi-client.changes  2007-03-26 12:54:22.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Mar 26 12:58:46 CEST 2007 - mzugec@xxxxxxx
+
+- auto log on when needed parameters read from iBFT card (#256227)
+- 2.14.9 
+
+-------------------------------------------------------------------

Old:
----
  yast2-iscsi-client-2.14.8.tar.bz2

New:
----
  yast2-iscsi-client-2.14.9.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.h13172/_old  2007-03-27 01:25:32.000000000 +0200
+++ /var/tmp/diff_new_pack.h13172/_new  2007-03-27 01:25:32.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-iscsi-client (Version 2.14.8)
+# spec file for package yast2-iscsi-client (Version 2.14.9)
 #
 # 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.8
+Version:        2.14.9
 Release:        1
 License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-iscsi-client-2.14.8.tar.bz2
+Source0:        yast2-iscsi-client-2.14.9.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.8
+%setup -n yast2-iscsi-client-2.14.9
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -65,6 +65,9 @@
 %doc %{prefix}/share/doc/packages/yast2-iscsi-client
 
 %changelog
+* Mon Mar 26 2007 - mzugec@xxxxxxx
+- auto log on when needed parameters read from iBFT card (#256227)
+- 2.14.9
 * Mon Mar 12 2007 - mzugec@xxxxxxx
 - restart iscsid when InitiatorName is changed (#244385)
 * Mon Mar 12 2007 - mzugec@xxxxxxx

++++++ yast2-iscsi-client-2.14.8.tar.bz2 -> yast2-iscsi-client-2.14.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.8/configure new/yast2-iscsi-client-2.14.9/configure
--- old/yast2-iscsi-client-2.14.8/configure     2007-03-12 15:18:49.000000000 +0100
+++ new/yast2-iscsi-client-2.14.9/configure     2007-03-26 12:56:06.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.7.
+# Generated by GNU Autoconf 2.60 for yast2-iscsi-client 2.14.8.
 #
 # 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.7'
-PACKAGE_STRING='yast2-iscsi-client 2.14.7'
+PACKAGE_VERSION='2.14.8'
+PACKAGE_STRING='yast2-iscsi-client 2.14.8'
 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.7 to adapt to many kinds of systems.
+\`configure' configures yast2-iscsi-client 2.14.8 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.7:";;
+     short | recursive ) echo "Configuration of yast2-iscsi-client 2.14.8:";;
    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.7
+yast2-iscsi-client configure 2.14.8
 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.7, which was
+It was created by yast2-iscsi-client $as_me 2.14.8, 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.7'
+ VERSION='2.14.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
 
 
 
-VERSION="2.14.7"
+VERSION="2.14.8"
 RPMNAME="yast2-iscsi-client"
 MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
 
@@ -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.7, which was
+This file was extended by yast2-iscsi-client $as_me 2.14.8, 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.7
+yast2-iscsi-client config.status 2.14.8
 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.8/configure.in new/yast2-iscsi-client-2.14.9/configure.in
--- old/yast2-iscsi-client-2.14.8/configure.in  2007-03-12 15:18:45.000000000 +0100
+++ new/yast2-iscsi-client-2.14.9/configure.in  2007-03-26 12:56:02.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.7, http://bugs.opensuse.org/, yast2-iscsi-client)
+AC_INIT(yast2-iscsi-client, 2.14.8, 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.7"
+VERSION="2.14.8"
 RPMNAME="yast2-iscsi-client"
 MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.8/src/IscsiClient.ycp new/yast2-iscsi-client-2.14.9/src/IscsiClient.ycp
--- old/yast2-iscsi-client-2.14.8/src/IscsiClient.ycp   2007-03-07 19:28:39.000000000 +0100
+++ new/yast2-iscsi-client-2.14.9/src/IscsiClient.ycp   2007-03-26 12:59:30.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:    IscsiClient settings, input and output functions
  * Authors:    Michal Zugec <mzugec@xxxxxxx>
  *
- * $Id: IscsiClient.ycp 36771 2007-03-07 18:26:26Z mzugec $
+ * $Id: IscsiClient.ycp 37109 2007-03-26 10:56:25Z mzugec $
  *
  * Representation of the configuration of iscsi-client.
  * Input and output routines.
@@ -365,30 +365,6 @@
  return ret;
 }
 
-boolean autoDiscovery(){
- map<string, any> b = getiBFT();
- if ( b != $[] ){
- map<string, any> result = (map<string, any>)SCR::Execute(.target.bash_output, 
-                       sformat("iscsiadm -m discovery -t st -p %1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"") );
-
- if(result["exit"]:0 != 0) {
-  Popup::Error(sformat("%1\n%2\n%3 %4:%5", _("Error:"), result["stderr"]:"", _("while discovering"), b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:""));
- } else {
-  if (connected([ sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:""), b["iSCSI_TARGET_NAME"]:""], true))
-                                                                                       y2milestone("Target given from iBFT is already connected");
-       else {
-  result = (map<string, any>)SCR::Execute(.target.bash_output, 
-       sformat("iscsiadm -m node -T %1 -p %2:%3 --login", b["iSCSI_TARGET_NAME"]:"", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"") );
-
-   if(result["exit"]:0 != 0) Popup::Error( sformat("%1\n%2\n%3 %4", 
-                               _("Error:"), result["stderr"]:"", _("while login into"), b["iSCSI_TARGET_NAME"]:""));
-   }
-  }
- }
-
- return true;
-}
-
 // change startup status (manual/automatic) for target
 global boolean setStartupStatus(list<string> record, string status){
  y2milestone("Set startup status for %1 to %2", record, status);
@@ -399,6 +375,34 @@
  return ret;
 }
 
+boolean autoLogOn(){
+ map<string, any> b = getiBFT();
+ if ( b != $[] ){
+  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"]:""];
+   if (connected( curr_rec , false) == false){
+
+  // 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){
+       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");
+
+  // 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
+  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");
+ }
+ return true;
+}
+
 // get status of open-iscsi
 boolean getServiceStatus(){
  boolean ret = true;
@@ -496,7 +500,7 @@
     sleep(sl);
 
     // read current settings
-    if(!autoDiscovery()) return false;
+    if(!autoLogOn()) return false;
     Progress::NextStage();
 
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.8/src/widgets.ycp new/yast2-iscsi-client-2.14.9/src/widgets.ycp
--- old/yast2-iscsi-client-2.14.8/src/widgets.ycp       2007-03-12 15:06:32.000000000 +0100
+++ new/yast2-iscsi-client-2.14.9/src/widgets.ycp       2007-03-21 11:04:17.000000000 +0100
@@ -203,7 +203,7 @@
        if (Stage::initial()){
         SCR::Execute(.target.bash, "killproc /sbin/iscsid");
         SCR::Execute(.background.run_output_err, "iscsid");
-       } SCR::Execute(.target.bash, "rcopen-iscsi restart");
+       } else SCR::Execute(.target.bash, "rcopen-iscsi restart");
        y2milestone("write initiatorname %1", IscsiClient::initiatorname);
  }
  return nil;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.8/VERSION new/yast2-iscsi-client-2.14.9/VERSION
--- old/yast2-iscsi-client-2.14.8/VERSION       2007-03-12 15:19:34.000000000 +0100
+++ new/yast2-iscsi-client-2.14.9/VERSION       2007-03-26 12:58:45.000000000 +0200
@@ -1 +1 @@
-2.14.8
+2.14.9


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread