Hello community,
here is the log from the commit of package yast2-iscsi-server for openSUSE:Factory
checked in at Wed Nov 4 11:16:48 CET 2009.
--------
--- yast2-iscsi-server/yast2-iscsi-server.changes 2009-03-09 15:53:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-iscsi-server/yast2-iscsi-server.changes 2009-11-03 12:51:20.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Nov 3 12:48:42 CET 2009 - mzugec@suse.cz
+
+- export credentials for target (fate#301932)
+- 2.18.4
+
+-------------------------------------------------------------------
+Thu May 21 09:19:51 CEST 2009 - mzugec@suse.cz
+
+- handle correctly when tgt is already installed (bnc#501375)
+- 2.18.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-iscsi-server-2.18.2.tar.bz2
New:
----
yast2-iscsi-server-2.18.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-server.spec ++++++
--- /var/tmp/diff_new_pack.VP9zLu/_old 2009-11-04 11:15:09.000000000 +0100
+++ /var/tmp/diff_new_pack.VP9zLu/_new 2009-11-04 11:15:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-server (Version 2.18.2)
+# spec file for package yast2-iscsi-server (Version 2.18.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-iscsi-server
-Version: 2.18.2
+Version: 2.18.4
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-server-2.18.2.tar.bz2
+Source0: yast2-iscsi-server-2.18.4.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
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
# network needs Wizard::OpenCancelOKDialog()
# function from yast2-2.18.2
@@ -36,10 +36,8 @@
%description
Configuration of iSCSI target
-
-
%prep
-%setup -n yast2-iscsi-server-2.18.2
+%setup -n yast2-iscsi-server-2.18.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -49,7 +47,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-iscsi-server-2.18.2.tar.bz2 -> yast2-iscsi-server-2.18.4.tar.bz2 ++++++
++++ 3585 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-server-2.18.2/Makefile.am new/yast2-iscsi-server-2.18.4/Makefile.am
--- old/yast2-iscsi-server-2.18.2/Makefile.am 2009-03-09 15:34:30.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/Makefile.am 2009-11-03 12:50:23.000000000 +0100
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#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
+ACLOCAL_AMFLAGS = -I . -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
cmp -s $< $@ || cp -f $< $@
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-server-2.18.2/VERSION new/yast2-iscsi-server-2.18.4/VERSION
--- old/yast2-iscsi-server-2.18.2/VERSION 2009-03-09 15:42:12.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/VERSION 2009-11-03 12:48:39.000000000 +0100
@@ -1 +1 @@
-2.18.2
+2.18.4
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-server-2.18.2/autodocs-ycp.ami new/yast2-iscsi-server-2.18.4/autodocs-ycp.ami
--- old/yast2-iscsi-server-2.18.2/autodocs-ycp.ami 2009-03-09 15:34:30.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/autodocs-ycp.ami 2009-11-03 12:50:23.000000000 +0100
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.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-server-2.18.2/configure.in new/yast2-iscsi-server-2.18.4/configure.in
--- old/yast2-iscsi-server-2.18.2/configure.in 2009-03-09 15:34:30.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/configure.in 2009-11-03 12:50:23.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-iscsi-server
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-server, 2.18.1, http://bugs.opensuse.org/, yast2-iscsi-server)
+AC_INIT(yast2-iscsi-server, 2.18.4, http://bugs.opensuse.org/, yast2-iscsi-server)
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.18.1"
+VERSION="2.18.4"
RPMNAME="yast2-iscsi-server"
MAINTAINER="Michal Zugec "
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-server-2.18.2/missing new/yast2-iscsi-server-2.18.4/missing
--- old/yast2-iscsi-server-2.18.2/missing 2009-03-09 15:34:39.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/missing 2009-11-03 12:50:27.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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-server-2.18.2/src/IscsiServer.ycp new/yast2-iscsi-server-2.18.4/src/IscsiServer.ycp
--- old/yast2-iscsi-server-2.18.2/src/IscsiServer.ycp 2008-03-05 08:29:09.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/src/IscsiServer.ycp 2009-05-21 09:30:00.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: IscsiServer settings, input and output functions
* Authors: Michal Zugec
*
- * $Id: IscsiServer.ycp 45026 2008-02-26 14:53:51Z mzugec $
+ * $Id: IscsiServer.ycp 57274 2009-05-21 07:29:59Z mzugec $
*
* Representation of the configuration of iscsi-server.
* Input and output routines.
@@ -27,6 +27,8 @@
import "IscsiServerFunctions";
import "Mode";
import "NetworkService";
+import "PackageSystem";
+import "Label";
boolean serviceStatus = false;
boolean statusOnStart = false;
@@ -125,15 +127,21 @@
// test if required package ("iscsitarget") is installed
boolean installed_packages(){
- boolean ret = false;
- y2milestone("Check if iscsitarget is installed");
- if( !Package::InstallMsg( "iscsitarget",
- _("<p>To configure the iSCSI target, the <b>%1</b> package must be installed.</p>") +
- _("<p>Install it now?</p>")) )
- {
- Popup::Error( Message::CannotContinueWithoutPackagesInstalled() );
- } else ret = true;
- return ret;
+ if (!PackageSystem::PackageInstalled("iscsitarget")){
+ y2milestone("Not installed, will install");
+ boolean confirm = Popup::AnyQuestionRichText(
+ "", _("Can't continue without installing iscsitarget package"), 40, 10,
+ Label::InstallButton(), Label::CancelButton (), `focus_yes
+ );
+
+ if (confirm){
+ if (PackageSystem::PackageInstalled("tgt")) PackageSystem::DoRemove(["tgt"]);
+ PackageSystem::DoInstall(["iscsitarget"]);
+ if (PackageSystem::PackageInstalled("iscsitarget")) return true;
+ else return false;
+ }
+ return false;
+ } else return true;
}
// check status of iscsitarget service
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-server-2.18.2/src/IscsiServerFunctions.pm new/yast2-iscsi-server-2.18.4/src/IscsiServerFunctions.pm
--- old/yast2-iscsi-server-2.18.2/src/IscsiServerFunctions.pm 2009-03-03 13:13:14.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/src/IscsiServerFunctions.pm 2009-11-03 11:19:03.000000000 +0100
@@ -5,8 +5,13 @@
package IscsiServerFunctions;
use strict;
+use YaST::YCP qw(:LOGGING);
use Data::Dumper;
use YaPI;
+use Switch;
+
+YaST::YCP::Import ("SCR");
+
our %TYPEINFO;
@@ -392,5 +397,63 @@
return \$ret;
}
+BEGIN { $TYPEINFO{SaveIntoFile} = ["function", "boolean", "string" ]; }
+sub SaveIntoFile {
+ my $self = shift;
+ my $filename = shift;
+ my $file="";
+ my $delimiter = "---------------------\n";
+
+ my $auth = $self->getConfig()->{"auth"};
+ if (defined $auth && scalar(@{$auth})>0){
+ $file = "Discovery authentication:\n" . $delimiter;
+ foreach my $row (@{$auth}){
+ $file = $file . $row->{'KEY'} . ": " . $row->{'VALUE'} . "\n";
+ }
+ $file = $file . "\n";
+ }
+
+# my $isns = $self->getConfig()->{"iSNS"};
+# if (defined $isns && $isns>0){
+# foreach my $row (@{$isns}){
+# y2internal("isns ", Dumper($row));
+# }
+# }
+
+ my %targets = %{$self->getTargets()};
+ if (scalar(keys %targets)>0){
+ $file = $file . "Targets\n" . $delimiter . "\n";
+ }
+ foreach my $target (keys %targets){
+ my $target_name = "";
+ my @auths = ();
+ my @luns = ();
+ foreach my $row (@{$targets{$target}}){
+ switch ($row->{'KEY'}) {
+ case ('Target') {
+ $target_name = $row->{'VALUE'};
+ }
+ case ('Lun') {
+ push(@luns, $row->{'VALUE'});
+ }
+ case ('IncomingUser' || 'OutgoingUser') {
+ push(@auths, $row->{'KEY'} . ": " . $row->{'VALUE'})
+ }
+ }
+ }
+ $file = $file . $target_name . "\n";
+ $file = $file . "Luns: " . join(', ', @luns) . "\n" if (scalar(@luns) > 0);
+ $file = $file . join("\n", @auths) if (scalar(@auths) > 0);
+ $file = $file . "\n";
+ }
+
+ y2milestone("Save report : \n", $file);
+
+ my $result = SCR -> Write (".target.string", $filename, $file);
+ y2milestone("Save result: ", $result);
+ return $result;
+}
+
+
1;
# EOF
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-server-2.18.2/src/dialogs.ycp new/yast2-iscsi-server-2.18.4/src/dialogs.ycp
--- old/yast2-iscsi-server-2.18.2/src/dialogs.ycp 2009-03-09 15:43:10.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/src/dialogs.ycp 2009-11-03 12:49:43.000000000 +0100
@@ -11,7 +11,7 @@
* Summary: Dialogs definitions
* Authors: Michal Zugec
*
- * $Id: dialogs.ycp 56021 2009-03-09 14:43:09Z mzugec $
+ * $Id: dialogs.ycp 59270 2009-11-03 11:49:42Z mzugec $
*/
{
@@ -49,6 +49,8 @@
"isns",
`VSpacing (2),
"firewall",
+ `VSpacing (2),
+ "save",
`VSpacing (2)
),
`HSpacing (1),
@@ -56,7 +58,7 @@
),
`VStretch()
),
- "widget_names" : [ "auto_start_up", "isns", "firewall" ]
+ "widget_names" : [ "auto_start_up", "isns", "firewall", "save" ]
],
// second tab - global authentication
"global":$[
@@ -102,8 +104,8 @@
"contents" :
`VBox(
`HBox(
- `TextEntry(`id(`target), _("Target"), "iqn.2001-04.com.example"),
- `TextEntry(`id(`identifier), _("Identifier"), "test")
+ `InputField(`id(`target), `opt(`hstretch), _("Target"), "iqn.2001-04.com.example"),
+ `InputField(`id(`identifier), `opt(`hstretch), _("Identifier"), "test")
),
`VBox(
`Table(`id(`lun_table),
@@ -144,7 +146,7 @@
`VSpacing(2),
`Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ),
`HBox(
- `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password"))
+ `InputField(`id(`user_out), `opt(`hstretch), _("Username")), `Password(`id(`pass_out), _("Password"))
)
)
]
@@ -174,13 +176,20 @@
"services" : [ "service:iscsitarget" ],
"display_details" : true,
]),
+ "save" : $[
+ "widget" : `push_button,
+ "label" : Label::SaveButton(),
+ "handle" : saveConfiguration,
+ "opt": [],
+ "help": HELPS["save_configuration"]:""
+ ],
"isns" : $[
"widget" : `custom,
"custom_widget" :
`HBox(
`CheckBoxFrame(`id(`isns_ac), _("iSNS Access Control"), true,
`VBox(
- `TextEntry(`id(`isns_ip), _("iSNS Server"))
+ `InputField(`id(`isns_ip), `opt(`hstretch), _("iSNS Server"))
))
),
"init" : initiSNS,
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-server-2.18.2/src/helps.ycp new/yast2-iscsi-server-2.18.4/src/helps.ycp
--- old/yast2-iscsi-server-2.18.2/src/helps.ycp 2008-09-08 13:05:41.000000000 +0200
+++ new/yast2-iscsi-server-2.18.4/src/helps.ycp 2009-11-03 12:49:43.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Michal Zugec
*
- * $Id: helps.ycp 50790 2008-09-08 11:05:40Z mzugec $
+ * $Id: helps.ycp 59270 2009-11-03 11:49:42Z mzugec $
*/
{
@@ -38,6 +38,10 @@
</p>
"),
+ "save_configuration" : _("<p><b>Save</b> button will export some informations about
+targets into selected file.</p>"),
+
+
/* Summary dialog help 1/3 */
"summary" : _("<p><b><big>iSCSI Target Configuration</big></b><br>
Configure an iSCSI target here.<br></p>
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-server-2.18.2/src/widgets.ycp new/yast2-iscsi-server-2.18.4/src/widgets.ycp
--- old/yast2-iscsi-server-2.18.2/src/widgets.ycp 2008-12-05 10:49:48.000000000 +0100
+++ new/yast2-iscsi-server-2.18.4/src/widgets.ycp 2009-11-03 11:23:27.000000000 +0100
@@ -47,22 +47,22 @@
map ret_map = $[];
term lun_dialog =
`VBox(
- `Left( `HWeight(3, `TextEntry( `id( `lun ), "LUN", previous["lun"]:"0" )) ),
+ `Left( `HWeight(3, `InputField( `id( `lun ), `opt(`hstretch), "LUN", previous["lun"]:"0" )) ),
`VSpacing(2),
`RadioButtonGroup(`id(`rb), `VBox(
`Left( `RadioButton(`id(`fileio), `opt(`notify), "Type=fileio", previous["fileio"]:true) ),
`HBox(
- `TextEntry( `id( `file_path ), _("Path:"), previous["path"]:""),
+ `InputField( `id( `file_path ), `opt(`hstretch), _("Path:"), previous["path"]:""),
`VBox(
`Label(""),
`PushButton(`id(`browse), _("Browse"))
)
),
- `TextEntry( `id( `scsi_id ), "ScsiId:", previous["scsi_id"]:"" ),
+ `InputField( `id( `scsi_id ), `opt(`hstretch), "ScsiId:", previous["scsi_id"]:"" ),
`VSpacing(2),
`Left( `RadioButton(`id(`nullio), `opt(`notify), "Type=nullio", previous["nullio"]:false) ),
- `TextEntry( `id( `sectors ), _("Sectors:"), previous["sectors"]:"" )
+ `InputField( `id( `sectors ), `opt(`hstretch), _("Sectors:"), previous["sectors"]:"" )
)
),
`Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() )))
@@ -149,7 +149,7 @@
// dialog to add/modify user and password
list <string> getDialogValues(string user, string pass){
UI::OpenDialog( `VBox(
- `TextEntry(`id(`p_user),_("Username"), user),
+ `InputField(`id(`p_user), `opt(`hstretch), _("Username"), user),
`Password(`id(`p_pass), _("Password"), pass),
`HBox(
`PushButton(`id(`ok), _("OK")),
@@ -175,6 +175,31 @@
else return [];
}
+
+symbol saveConfiguration(string key, map event){
+ if (is(event["ID"]:nil, string) && event["ID"]:"" == "save"){
+ any filename = UI::AskForSaveFileName("/", "*", _("Save as..."));
+ if ( filename != nil && (string)filename!="")
+ {
+ if ( IscsiServerFunctions::SaveIntoFile( (string)filename ))
+ {
+ Popup::Message(sformat(_("File %1 was saved successfully."), filename));
+ list pathComponents = splitstring( (string)filename, "/");
+ integer s = size(pathComponents) - 1;
+ string base = pathComponents[s]:"default";
+ }
+ else
+ {
+ Popup::Warning(_("An error occured while saving the file."));
+ }
+ }
+ }
+ return nil;
+}
+
+
+
+
// **************** Server Dialog *********************
// dialog with targets
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org