Hello community,
here is the log from the commit of package yast2-iscsi-client
checked in at Tue Feb 6 19:18:51 CET 2007.
--------
--- yast2-iscsi-client/yast2-iscsi-client.changes 2007-01-22 09:14:34.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-iscsi-client/yast2-iscsi-client.changes 2007-02-06 10:51:34.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Feb 6 10:51:37 CET 2007 - mzugec@suse.de
+
+- wrong initiatorname.iscsi path (#238738)
+- no feedback from SaveName button (#239344)
+- allow define of initiator (#232501)
+- 2.14.2
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-2.14.1.tar.bz2
New:
----
yast2-iscsi-client-2.14.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.u31581/_old 2007-02-06 19:17:52.000000000 +0100
+++ /var/tmp/diff_new_pack.u31581/_new 2007-02-06 19:17:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-client (Version 2.14.1)
+# spec file for package yast2-iscsi-client (Version 2.14.2)
#
# 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.1
+Version: 2.14.2
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-client-2.14.1.tar.bz2
+Source0: yast2-iscsi-client-2.14.2.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
@@ -29,7 +29,7 @@
%prep
-%setup -n yast2-iscsi-client-2.14.1
+%setup -n yast2-iscsi-client-2.14.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -65,6 +65,11 @@
%doc %{prefix}/share/doc/packages/yast2-iscsi-client
%changelog -n yast2-iscsi-client
+* Tue Feb 06 2007 - mzugec@suse.de
+- wrong initiatorname.iscsi path (#238738)
+- no feedback from SaveName button (#239344)
+- allow define of initiator (#232501)
+- 2.14.2
* Mon Jan 22 2007 - mzugec@suse.cz
- fate #300684 - support for iBFT
* Mon Oct 23 2006 - mzugec@suse.cz
++++++ yast2-iscsi-client-2.14.1.tar.bz2 -> yast2-iscsi-client-2.14.2.tar.bz2 ++++++
++++ 5732 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/autodocs-ycp.ami new/yast2-iscsi-client-2.14.2/autodocs-ycp.ami
--- old/yast2-iscsi-client-2.14.1/autodocs-ycp.ami 2007-01-22 09:02:59.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/autodocs-ycp.ami 2007-02-06 10:49:23.000000000 +0100
@@ -1,18 +1,27 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
# PARAMETERS:
# AUTODOCS_YCP: Files that the ycp autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
htmldir = $(docdir)/autodocs
html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
-AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp
-index.html: $(AUTODOCS_YCP)
- ${YCPDOC} -d. $^
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/configure.in new/yast2-iscsi-client-2.14.2/configure.in
--- old/yast2-iscsi-client-2.14.1/configure.in 2007-01-22 09:02:59.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/configure.in 2007-02-06 10:49:23.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-iscsi-client
dnl
-dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
+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.0, http://bugs.opensuse.org/, yast2-iscsi-client)
+AC_INIT(yast2-iscsi-client, 2.14.1, 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.0"
+VERSION="2.14.1"
RPMNAME="yast2-iscsi-client"
MAINTAINER="Michal Zugec "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile agents/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/Makefile.am new/yast2-iscsi-client-2.14.2/Makefile.am
--- old/yast2-iscsi-client-2.14.1/Makefile.am 2007-01-22 09:03:00.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/Makefile.am 2007-02-06 10:49:24.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/Makefile.am.common new/yast2-iscsi-client-2.14.2/Makefile.am.common
--- old/yast2-iscsi-client-2.14.1/Makefile.am.common 2007-01-22 09:02:59.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/Makefile.am.common 2007-02-06 10:49:23.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/src/dialogs.ycp new/yast2-iscsi-client-2.14.2/src/dialogs.ycp
--- old/yast2-iscsi-client-2.14.1/src/dialogs.ycp 2007-01-22 09:02:47.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/src/dialogs.ycp 2007-02-06 10:52:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Michal Zugec
*
- * $Id: dialogs.ycp 35560 2007-01-22 08:02:23Z mzugec $
+ * $Id: dialogs.ycp 35883 2007-02-06 09:51:05Z mzugec $
*/
{
@@ -45,7 +45,7 @@
"custom_widget" :
`HBox(
// `HSpacing(7),
- `MinWidth( 16, `TextEntry(`id(`initiator_name), _("Initiator Name")) ),
+ `MinWidth( 16, `TextEntry(`id(`initiator_name), `opt(`notify), _("Initiator Name")) ),
`VBox(
`VSpacing(1),
`PushButton(`id(`write), _("Save Name"))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/src/inst_iscsi-client.ycp new/yast2-iscsi-client-2.14.2/src/inst_iscsi-client.ycp
--- old/yast2-iscsi-client-2.14.1/src/inst_iscsi-client.ycp 2006-04-24 08:05:44.000000000 +0200
+++ new/yast2-iscsi-client-2.14.2/src/inst_iscsi-client.ycp 2007-02-06 10:52:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Michal Zugec
*
- * $Id: inst_iscsi-client.ycp 30374 2006-04-24 05:55:11Z mzugec $
+ * $Id: inst_iscsi-client.ycp 35883 2007-02-06 09:51:05Z mzugec $
*
* Main file for iscsi-client configuration. Uses all other files.
*/
@@ -26,6 +26,7 @@
import "Summary";
import "ModuleLoading";
import "Packages";
+import "Installation";
include "iscsi-client/wizards.ycp";
/* main ui function */
@@ -33,7 +34,9 @@
y2milestone("start open-iscsi");
// check initiator name, create if not exists
+WFM::Execute (.local.bash,"test -d /etc/iscsi/ && /bin/cp -a /etc/iscsi/* " + Installation::destdir + "/etc/iscsi/");
IscsiClient::checkInitiatorName();
+
ModuleLoading::Load("iscsi_tcp", "", "", "", false, true);
// start daemon before
SCR::Execute(.background.run_output_err, "iscsid");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/src/iscsi-client_finish.ycp new/yast2-iscsi-client-2.14.2/src/iscsi-client_finish.ycp
--- old/yast2-iscsi-client-2.14.1/src/iscsi-client_finish.ycp 2006-10-23 17:55:26.000000000 +0200
+++ new/yast2-iscsi-client-2.14.2/src/iscsi-client_finish.ycp 2007-02-06 10:49:16.000000000 +0100
@@ -45,6 +45,7 @@
{
// write open-iscsi database of automatic connected targets
WFM::Execute (.local.bash,"test -d /var/lib/open-iscsi/ && /bin/cp -a /var/lib/open-iscsi/* " + Installation::destdir + "/var/lib/open-iscsi/");
+ WFM::Execute (.local.bash,"test -d /etc/iscsi/ && /bin/cp -a /etc/iscsi/* " + Installation::destdir + "/etc/iscsi/");
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/src/IscsiClient.ycp new/yast2-iscsi-client-2.14.2/src/IscsiClient.ycp
--- old/yast2-iscsi-client-2.14.1/src/IscsiClient.ycp 2007-01-22 09:02:47.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/src/IscsiClient.ycp 2007-02-06 10:52:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: IscsiClient settings, input and output functions
* Authors: Michal Zugec
*
- * $Id: IscsiClient.ycp 35560 2007-01-22 08:02:23Z mzugec $
+ * $Id: IscsiClient.ycp 35883 2007-02-06 09:51:05Z mzugec $
*
* Representation of the configuration of iscsi-client.
* Input and output routines.
@@ -264,7 +264,7 @@
global boolean checkInitiatorName(){
boolean ret=true;
string initiatorname="";
- string file="/etc/initiatorname.iscsi";
+ string file="/etc/iscsi/initiatorname.iscsi";
string name_from_bios = getiBFT()["iSCSI_INITIATOR_NAME"]:"";
y2milestone("Check %1", file);
@@ -284,11 +284,11 @@
ret = (boolean)SCR::Write (.target.string, file, sformat("InitiatorName=%1", initiatorname));
SCR::Execute (.target.bash, "chmod 0600 $FILE" ,$["FILE":file]);
} else {
- string initiatorname=((map)SCR::Execute(.target.bash_output, "cat /etc/initiatorname.iscsi|cut -d'=' -f2|tr -d '\n'"))["stdout"]:"";
+ string initiatorname=((map)SCR::Execute(.target.bash_output, sformat("cat %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:"";
if (size(name_from_bios)>0 && name_from_bios!=initiatorname){
- Popup::Warning( _("InitiatorName from iBFT and from /etc/initiatorname.iscsi are differ.\nOld initiatorname will be replaced by value from iBFT and create a backup.\nIf you want to use different initiatorname change it in BIOS.") );
+ Popup::Warning( _("InitiatorName from iBFT and from /etc/iscsi/initiatorname.iscsi are differ.\nOld initiatorname will be replaced by value from iBFT and create a backup.\nIf you want to use different initiatorname change it in BIOS.") );
y2milestone("replacing old name %1 by name %2 from iBFT", initiatorname, name_from_bios);
- SCR::Execute(.target.bash, sformat("mv /etc/initiatorname.iscsi /etc/initiatorname.yastbackup ;echo \"InitiatorName=%1\">/etc/initiatorname.iscsi", name_from_bios));
+ SCR::Execute(.target.bash, sformat("mv %1 /etc/iscsi/initiatorname.yastbackup ;echo \"InitiatorName=%2\">%3", file, name_from_bios, file));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/src/widgets.ycp new/yast2-iscsi-client-2.14.2/src/widgets.ycp
--- old/yast2-iscsi-client-2.14.1/src/widgets.ycp 2007-01-22 09:02:47.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/src/widgets.ycp 2007-02-06 10:49:16.000000000 +0100
@@ -4,8 +4,7 @@
boolean stat = false;
list<string> curr_rec = [];
boolean bg_finish = false;
-
-
+ string initiatorname="";
// function for run command in background
list <string> runInBg(string command){
bg_finish=false;
@@ -174,7 +173,8 @@
}
void initInitName(string key){
- string initiatorname=((map)SCR::Execute(.target.bash_output, "cat /etc/initiatorname.iscsi|cut -d'=' -f2|tr -d '\n'"))["stdout"]:"";
+ initiatorname = ((map)SCR::Execute(.target.bash_output, "cat /etc/iscsi/initiatorname.iscsi|cut -d'=' -f2|tr -d '\n'"))["stdout"]:"";
+
y2milestone("initiatorname %1", initiatorname);
UI::ChangeWidget(`initiator_name, `Value, initiatorname);
if (size(IscsiClient::getiBFT()["iSCSI_INITIATOR_NAME"]:"")>0){
@@ -182,13 +182,20 @@
UI::ChangeWidget(`write, `Enabled, false);
}
}
+
+
symbol handleInitName (string key, map event){
if (event["EventReason"]:"" == "Activated" && event["ID"]:nil==`write){
// write initiatorname
- string initiatorname = (string)UI::QueryWidget(`initiator_name, `Value);
- SCR::Execute(.target.bash, sformat("echo \"InitiatorName=%1\">/etc/initiatorname.iscsi", initiatorname));
+ initiatorname = (string)UI::QueryWidget(`initiator_name, `Value);
+ SCR::Execute(.target.bash, sformat("echo \"InitiatorName=%1\">/etc/iscsi/initiatorname.iscsi", initiatorname));
y2milestone("write initiatorname %1", initiatorname);
}
+ if ((string)UI::QueryWidget(`initiator_name, `Value) == initiatorname){
+ UI::ChangeWidget(`write, `Enabled, false);
+ } else {
+ UI::ChangeWidget(`write, `Enabled, true);
+ }
return nil;
}
// ***************** iBFT table **************************
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-client-2.14.1/VERSION new/yast2-iscsi-client-2.14.2/VERSION
--- old/yast2-iscsi-client-2.14.1/VERSION 2007-01-22 09:13:30.000000000 +0100
+++ new/yast2-iscsi-client-2.14.2/VERSION 2007-02-06 10:51:35.000000000 +0100
@@ -1 +1 @@
-2.14.1
+2.14.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org