Hello community,
here is the log from the commit of package yast2-iscsi-client
checked in at Fri Jul 11 14:28:17 CEST 2008.
--------
--- yast2-iscsi-client/yast2-iscsi-client.changes 2008-05-22 19:03:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-iscsi-client/yast2-iscsi-client.changes 2008-07-10 15:53:02.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Jul 10 15:49:59 CEST 2008 - mzugec@suse.de
+
+- when Log on, do startup automatic by default (bnc#400610)
+- improved InitiatorName validator
+- 2.17.1
+
+-------------------------------------------------------------------
+Thu Jul 10 13:33:46 CEST 2008 - mzugec@suse.de
+
+- fixed text in Write dialog (bnc#393929)
+- fixed InitiatorName validation (bnc#406726)
+- 2.17.0
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-2.16.14.tar.bz2
New:
----
yast2-iscsi-client-2.17.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.t21725/_old 2008-07-11 14:26:58.000000000 +0200
+++ /var/tmp/diff_new_pack.t21725/_new 2008-07-11 14:26:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-client (Version 2.16.14)
+# spec file for package yast2-iscsi-client (Version 2.17.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,25 +12,26 @@
Name: yast2-iscsi-client
-Version: 2.16.14
+Version: 2.17.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-client-2.16.14.tar.bz2
+Source0: yast2-iscsi-client-2.17.1.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libicu-devel libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-packager yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-packager
BuildArch: noarch
-Summary: YaST2 - Configuration of iscsi-client
+Summary: YaST2 - iSCSI Client Configuration
%description
-Configuration of iscsi-client
+This package contains the YaST2 component for configuration of an iSCSI
+client.
%prep
-%setup -n yast2-iscsi-client-2.16.14
+%setup -n yast2-iscsi-client-2.17.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -65,8 +66,15 @@
%{prefix}/share/applications/YaST2/iscsi-client.desktop
/usr/share/YaST2/scrconf/iscsid.scr
%doc %{prefix}/share/doc/packages/yast2-iscsi-client
-
%changelog
+* Thu Jul 10 2008 mzugec@suse.de
+- when Log on, do startup automatic by default (bnc#400610)
+- improved InitiatorName validator
+- 2.17.1
+* Thu Jul 10 2008 mzugec@suse.de
+- fixed text in Write dialog (bnc#393929)
+- fixed InitiatorName validation (bnc#406726)
+- 2.17.0
* Thu May 22 2008 locilka@suse.cz
- Not only open-iscsi, but also boot.open-iscsi service should be
enabled (bnc #393057).
++++++ yast2-iscsi-client-2.16.14.tar.bz2 -> yast2-iscsi-client-2.17.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.16.14/configure new/yast2-iscsi-client-2.17.1/configure
--- old/yast2-iscsi-client-2.16.14/configure 2008-05-22 18:29:09.000000000 +0200
+++ new/yast2-iscsi-client-2.17.1/configure 2008-07-10 15:48:02.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-iscsi-client 2.16.14.
+# Generated by GNU Autoconf 2.61 for yast2-iscsi-client 2.17.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-iscsi-client'
PACKAGE_TARNAME='yast2-iscsi-client'
-PACKAGE_VERSION='2.16.14'
-PACKAGE_STRING='yast2-iscsi-client 2.16.14'
+PACKAGE_VERSION='2.17.0'
+PACKAGE_STRING='yast2-iscsi-client 2.17.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.14 to adapt to many kinds of systems.
+\`configure' configures yast2-iscsi-client 2.17.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-iscsi-client 2.16.14:";;
+ short | recursive ) echo "Configuration of yast2-iscsi-client 2.17.0:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-iscsi-client configure 2.16.14
+yast2-iscsi-client configure 2.17.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.16.14, which was
+It was created by yast2-iscsi-client $as_me 2.17.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-iscsi-client'
- VERSION='2.16.14'
+ VERSION='2.17.0'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.14"
+VERSION="2.17.0"
RPMNAME="yast2-iscsi-client"
MAINTAINER="Michal Zugec "
@@ -3304,7 +3304,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.16.14, which was
+This file was extended by yast2-iscsi-client $as_me 2.17.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-iscsi-client config.status 2.16.14
+yast2-iscsi-client config.status 2.17.0
configured by $0, generated by GNU Autoconf 2.61,
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.16.14/configure.in new/yast2-iscsi-client-2.17.1/configure.in
--- old/yast2-iscsi-client-2.16.14/configure.in 2008-05-22 18:29:04.000000000 +0200
+++ new/yast2-iscsi-client-2.17.1/configure.in 2008-07-10 15:47:47.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-client, 2.16.14, http://bugs.opensuse.org/, yast2-iscsi-client)
+AC_INIT(yast2-iscsi-client, 2.17.0, http://bugs.opensuse.org/, yast2-iscsi-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.14"
+VERSION="2.17.0"
RPMNAME="yast2-iscsi-client"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.16.14/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.17.1/src/IscsiClientLib.ycp
--- old/yast2-iscsi-client-2.16.14/src/IscsiClientLib.ycp 2008-05-22 18:07:47.000000000 +0200
+++ new/yast2-iscsi-client-2.17.1/src/IscsiClientLib.ycp 2008-07-10 14:56:48.000000000 +0200
@@ -7,6 +7,7 @@
import "Hostname";
import "Stage";
import "ModuleLoading";
+import "Mode";
global list <string> sessions = [];
global list <string> discovered = [];
@@ -251,14 +252,14 @@
}
string getReverseDomainName(){
-list<string> host_fq = Hostname::SplitFQ(((map)SCR::Execute(.target.bash_output, "hostname -f|tr -d '\n'"))["stdout"]:"");
-y2internal("hostfw%1", host_fq);
-string domain = "";
-
-foreach(string item, splitstring(host_fq[1]:"example.com", "."),{
- y2internal("item %1", item);
- domain = (size(domain)==0) ? item : sformat("%1.%2", item, domain);
-});
+ list<string> host_fq = Hostname::SplitFQ(((map)SCR::Execute(.target.bash_output, "hostname -f|tr -d '\n'"))["stdout"]:"");
+ y2internal("hostfw%1", host_fq);
+ string domain = "";
+
+ foreach(string item, splitstring(host_fq[1]:"example.com", "."),{
+ y2internal("item %1", item);
+ domain = (size(domain)==0) ? item : sformat("%1.%2", item, domain);
+ });
y2milestone("domain %1", domain);
return domain;
@@ -429,8 +430,17 @@
map output = (map)SCR::Execute(.target.bash_output,
sformat("iscsiadm -m node -T %1 -p %2 --login", target["target"]:"", target["portal"]:""));
-y2internal("output %1", output);
- return output["exit"]:-1==0;
+ y2internal("output %1", output);
+// if (output["exit"]:-1==0){
+ // set startup status to auto by default (bnc#400610)
+ if (!Mode::autoinst()) setStartupStatus(curr_rec, "automatic");
+ return true;
+/*
+ } else {
+ y2error("Error while Log-on into target : %1", output);
+ return false;
+ }
+*/
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.16.14/src/IscsiClient.ycp new/yast2-iscsi-client-2.17.1/src/IscsiClient.ycp
--- old/yast2-iscsi-client-2.16.14/src/IscsiClient.ycp 2008-05-22 16:19:26.000000000 +0200
+++ new/yast2-iscsi-client-2.17.1/src/IscsiClient.ycp 2008-07-09 18:24:33.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: IscsiClient settings, input and output functions
* Authors: Michal Zugec
*
- * $Id: IscsiClient.ycp 47805 2008-05-22 14:13:49Z mzugec $
+ * $Id: IscsiClient.ycp 48951 2008-07-10 11:00:13Z mzugec $
*
* Representation of the configuration of iscsi-client.
* Input and output routines.
@@ -219,49 +219,41 @@
string caption = _("Saving iSCSI Initiator Configuration");
// TODO FIXME And set the right number of stages
- integer steps = 2;
integer sl = 500;
sleep(sl);
- // TODO FIXME Names of real stages
- // We do not set help text here, because it was set outside
- Progress::New(caption, " ", steps, [
+ list<string> descr = [
/* Progress stage 1/2 */
- _("Write the settings"),
+ _("Write the autoYaST settings"),
/* Progress stage 2/2 */
- _("Run SuSEconfig")
- ], [
- /* Progress step 1/2 */
- _("Writing the settings..."),
- /* Progress step 2/2 */
- _("Running SuSEconfig..."),
- /* Progress finished */
- _("Finished")
- ],
- ""
- );
+ _("Set up service status")
+ ];
+ if (!Mode::autoinst()) descr=remove(descr, 0);
+ // TODO FIXME Names of real stages
+ // We do not set help text here, because it was set outside
+ Progress::New(caption, " ", size(descr), descr, [], "");
- if(Abort()) return false;
- Progress::NextStage();
- IscsiClientLib::autoyastPrepare();
-// if( return false;
- sleep(sl);
+ if (Mode::autoinst()){
+ if(Abort()) return false;
+ Progress::NextStage();
+ IscsiClientLib::autoyastPrepare();
+ IscsiClientLib::autoyastWrite();
+ sleep(sl);
+ }
if(Abort()) return false;
Progress::NextStage ();
-// if(!
- IscsiClientLib::autoyastWrite();
-//) return false;
+ // set open-iscsi service status
+ if(!IscsiClientLib::setServiceStatus()) return false;
sleep(sl);
if(Abort()) return false;
Progress::NextStage();
+ if (Stage::initial() && size(IscsiClientLib::sessions)>0 )
+ Packages::addAdditionalPackage("open-iscsi");
sleep(sl);
- // set open-iscsi service status
- if(!IscsiClientLib::setServiceStatus()) return false;
- if (Stage::initial() && size(IscsiClientLib::sessions)>0 ) Packages::addAdditionalPackage("open-iscsi");
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.16.14/src/widgets.ycp new/yast2-iscsi-client-2.17.1/src/widgets.ycp
--- old/yast2-iscsi-client-2.16.14/src/widgets.ycp 2008-04-21 10:56:58.000000000 +0200
+++ new/yast2-iscsi-client-2.17.1/src/widgets.ycp 2008-07-10 15:46:23.000000000 +0200
@@ -252,18 +252,18 @@
*/
string i_name = (string)UI::QueryWidget(`initiator_name, `Value);
- // regexp for "iqn.yyyy-mm."
- string reg1 = "^iqn\.[[:digit:]]\{4\}\-[[:digit:]]\{2\}\.";
+ // regexp for "yyyy-mm."
+ string reg1 = "[[:digit:]]\{4\}\-[[:digit:]]\{2\}\.";
// regexp for "cz.suse" or just "suse", "cz.su-se"
- string reg2 = "([[:alnum:]][[:alnum:]-]+\.){0,1}[[:alnum:]][[:alnum:]-]{1,}";
- // regexp for [:identifier]
- string reg3 = "[:[:alnum:]*.{,1}]*";
+ string reg2 = "[[:alnum:]\.\:-]*";
- boolean correct = regexpmatch(i_name, sformat("%1%2%3\$", reg1, reg2, reg3));
+ boolean correct = regexpmatch(i_name, sformat("^iqn\.%1%2$", reg1, reg2)) ||
+ regexpmatch(i_name, sformat("^eui\.%1%2$", reg1, reg2));
if (!correct) Popup::Warning(_("Incorrect InitiatorName.
The correct syntax is
-iqn.yyyy-mm.reversed domain name[:identifier]
+iqn.yyyy-mm.reversed.domain.name[:identifier]
+or eui.yyyy-mm.reversed.domain.name[:identifier]
Example:
iqn.2007-04.cz.server:storage.disk.sdb
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.16.14/VERSION new/yast2-iscsi-client-2.17.1/VERSION
--- old/yast2-iscsi-client-2.16.14/VERSION 2008-05-22 18:11:52.000000000 +0200
+++ new/yast2-iscsi-client-2.17.1/VERSION 2008-07-10 15:49:44.000000000 +0200
@@ -1 +1 @@
-2.16.14
+2.17.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org