Hello community,
here is the log from the commit of package yast2-iscsi-server
checked in at Tue May 9 13:10:11 CEST 2006.
--------
--- yast2-iscsi-server/yast2-iscsi-server.changes 2006-04-24 11:24:07.000000000 +0200
+++ NOARCH/yast2-iscsi-server/yast2-iscsi-server.changes 2006-05-09 11:20:27.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 9 11:18:05 CEST 2006 - mzugec@suse.cz
+
+- fixed #173818 - support for autoyast
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-server-2.13.17.tar.bz2
New:
----
yast2-iscsi-server-2.13.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-server.spec ++++++
--- /var/tmp/diff_new_pack.2vfboh/_old 2006-05-09 13:09:38.000000000 +0200
+++ /var/tmp/diff_new_pack.2vfboh/_new 2006-05-09 13:09:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-server (Version 2.13.17)
+# spec file for package yast2-iscsi-server (Version 2.13.18)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-iscsi-server
-Version: 2.13.17
-Release: 1
+Version: 2.13.18
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-server-2.13.17.tar.bz2
+Source0: yast2-iscsi-server-2.13.18.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-server-2.13.17
+%setup -n yast2-iscsi-server-2.13.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -64,6 +64,8 @@
%doc %{prefix}/share/doc/packages/yast2-iscsi-server
%changelog -n yast2-iscsi-server
+* Tue May 09 2006 - mzugec@suse.cz
+- fixed #173818 - support for autoyast
* Mon Apr 24 2006 - mzugec@suse.cz
- fixed #168732 - deleted values from auth are stored
* Mon Apr 24 2006 - mzugec@suse.cz
++++++ yast2-iscsi-server-2.13.17.tar.bz2 -> yast2-iscsi-server-2.13.18.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.17/VERSION new/yast2-iscsi-server-2.13.18/VERSION
--- old/yast2-iscsi-server-2.13.17/VERSION 2006-04-24 11:21:58.000000000 +0200
+++ new/yast2-iscsi-server-2.13.18/VERSION 2006-05-09 11:18:01.000000000 +0200
@@ -1 +1 @@
-2.13.17
+2.13.18
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.17/configure new/yast2-iscsi-server-2.13.18/configure
--- old/yast2-iscsi-server-2.13.17/configure 2006-04-24 11:14:57.000000000 +0200
+++ new/yast2-iscsi-server-2.13.18/configure 2006-05-09 11:15:00.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-iscsi-server 2.13.16.
+# Generated by GNU Autoconf 2.59 for yast2-iscsi-server 2.13.17.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-iscsi-server'
PACKAGE_TARNAME='yast2-iscsi-server'
-PACKAGE_VERSION='2.13.16'
-PACKAGE_STRING='yast2-iscsi-server 2.13.16'
+PACKAGE_VERSION='2.13.17'
+PACKAGE_STRING='yast2-iscsi-server 2.13.17'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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-server 2.13.16 to adapt to many kinds of systems.
+\`configure' configures yast2-iscsi-server 2.13.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-iscsi-server 2.13.16:";;
+ short | recursive ) echo "Configuration of yast2-iscsi-server 2.13.17:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-iscsi-server configure 2.13.16
+yast2-iscsi-server configure 2.13.17
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-server $as_me 2.13.16, which was
+It was created by yast2-iscsi-server $as_me 2.13.17, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-iscsi-server'
- VERSION='2.13.16'
+ VERSION='2.13.17'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.16"
+VERSION="2.13.17"
RPMNAME="yast2-iscsi-server"
MAINTAINER="Michal Zugec "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-iscsi-server $as_me 2.13.16, which was
+This file was extended by yast2-iscsi-server $as_me 2.13.17, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-iscsi-server config.status 2.13.16
+yast2-iscsi-server config.status 2.13.17
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.17/configure.in new/yast2-iscsi-server-2.13.18/configure.in
--- old/yast2-iscsi-server-2.13.17/configure.in 2006-04-24 11:14:50.000000000 +0200
+++ new/yast2-iscsi-server-2.13.18/configure.in 2006-05-09 11:14:54.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-server, 2.13.16, http://www.suse.de/feedback, yast2-iscsi-server)
+AC_INIT(yast2-iscsi-server, 2.13.17, http://www.suse.de/feedback, yast2-iscsi-server)
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.13.16"
+VERSION="2.13.17"
RPMNAME="yast2-iscsi-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.17/iscsi-server.pot new/yast2-iscsi-server-2.13.18/iscsi-server.pot
--- old/yast2-iscsi-server-2.13.17/iscsi-server.pot 2006-03-06 11:34:37.000000000 +0100
+++ new/yast2-iscsi-server-2.13.18/iscsi-server.pot 2006-05-09 10:13:26.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 11:34+0100\n"
+"POT-Creation-Date: 2006-05-09 10:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,190 +16,190 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/IscsiServer.ycp:235
+#: src/IscsiServer.ycp:127
#, ycp-format
-msgid "<p>To configure the iSCSI Target, the <b>%1</b> package must be installed.</p>"
+msgid "<p>To configure the iSCSI target, the <b>%1</b> package must be installed.</p>"
msgstr ""
-#: src/IscsiServer.ycp:236
+#: src/IscsiServer.ycp:128
msgid "<p>Install it now?</p>"
msgstr ""
+#: src/IscsiServer.ycp:159
+msgid "If changes have been made, the iSCSI target is not able \n"
+msgstr ""
+
#. IscsiServer read dialog caption
-#: src/IscsiServer.ycp:265
+#: src/IscsiServer.ycp:234
msgid "Initializing iSCSI Target Configuration"
msgstr ""
#. Progress stage 1/3
-#: src/IscsiServer.ycp:277
+#: src/IscsiServer.ycp:246
msgid "Read the database"
msgstr ""
#. Progress stage 2/3
-#: src/IscsiServer.ycp:279
+#: src/IscsiServer.ycp:248
msgid "Read the previous settings"
msgstr ""
#. Progress stage 3/3
-#: src/IscsiServer.ycp:281
+#: src/IscsiServer.ycp:250
msgid "Detect the devices"
msgstr ""
#. Progress step 1/3
-#: src/IscsiServer.ycp:284
+#: src/IscsiServer.ycp:253
msgid "Reading the database..."
msgstr ""
#. Progress step 2/3
-#: src/IscsiServer.ycp:286
+#: src/IscsiServer.ycp:255
msgid "Reading the previous settings..."
msgstr ""
#. Progress step 3/3
-#: src/IscsiServer.ycp:288
+#: src/IscsiServer.ycp:257
msgid "Detecting the devices..."
msgstr ""
#. Progress finished
-#: src/IscsiServer.ycp:290 src/IscsiServer.ycp:368
+#: src/IscsiServer.ycp:259 src/IscsiServer.ycp:335
msgid "Finished"
msgstr ""
-#. IscsiServer read dialog caption
-#: src/IscsiServer.ycp:347
+#. IscsiServer write dialog caption
+#: src/IscsiServer.ycp:314
msgid "Saving iSCSI Target Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/IscsiServer.ycp:359
+#: src/IscsiServer.ycp:326
msgid "Write the settings"
msgstr ""
#. Progress stage 2/2
-#: src/IscsiServer.ycp:361
+#: src/IscsiServer.ycp:328
msgid "Run SuSEconfig"
msgstr ""
#. Progress step 1/2
-#: src/IscsiServer.ycp:364
+#: src/IscsiServer.ycp:331
msgid "Writing the settings..."
msgstr ""
#. Progress step 2/2
-#: src/IscsiServer.ycp:366
+#: src/IscsiServer.ycp:333
msgid "Running SuSEconfig..."
msgstr ""
-#: src/IscsiServer.ycp:377
-msgid "If changes have been made, the iSCSI target is not able \n"
-msgstr ""
-
-#. Error message
-#: src/IscsiServer.ycp:389
+#. write configuration (/etc/ietd.conf)
+#: src/IscsiServer.ycp:347
msgid "Cannot write settings."
msgstr ""
-#. TODO FIXME: your code here...
-#. Configuration summary text for autoyast
-#: src/IscsiServer.ycp:436
+#: src/IscsiServer.ycp:449
msgid "Configuration summary..."
msgstr ""
-#: src/dialogs.ycp:31
+#: src/dialogs.ycp:32
msgid "Service"
msgstr ""
-#: src/dialogs.ycp:52
+#: src/dialogs.ycp:54
msgid "Global"
msgstr ""
-#: src/dialogs.ycp:71 src/dialogs.ycp:153
+#: src/dialogs.ycp:74 src/dialogs.ycp:160
msgid "Targets"
msgstr ""
-#. radio button (starting SLP service - option 1)
-#: src/dialogs.ycp:99
+#. radio button (starting iscsitarget service - option 1)
+#: src/dialogs.ycp:102
msgid "When &Booting"
msgstr ""
-#. radio button (starting SLP service - option 2)
-#: src/dialogs.ycp:101
+#. radio button (starting iscsitarget service - option 2)
+#: src/dialogs.ycp:104
msgid "&Manually"
msgstr ""
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/dialogs.ycp:104
+#. part of help text, used to describe radiobuttons (matching starting iscsitarget service but without "&")
+#: src/dialogs.ycp:107
msgid "When Booting"
msgstr ""
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/dialogs.ycp:106
+#. part of help text, used to describe radiobuttons (matching starting iscsitarget service but without "&")
+#: src/dialogs.ycp:109
msgid "Manually"
msgstr ""
-#: src/dialogs.ycp:118 src/dialogs.ycp:193
+#: src/dialogs.ycp:124 src/dialogs.ycp:202
msgid "No Authentication"
msgstr ""
-#: src/dialogs.ycp:120 src/dialogs.ycp:195
+#: src/dialogs.ycp:126 src/dialogs.ycp:204
msgid "Incoming Authentication"
msgstr ""
-#: src/dialogs.ycp:123 src/dialogs.ycp:137 src/dialogs.ycp:198
-#: src/dialogs.ycp:212 src/widgets.ycp:47
+#: src/dialogs.ycp:129 src/dialogs.ycp:143 src/dialogs.ycp:207
+#: src/dialogs.ycp:221 src/widgets.ycp:57
msgid "Username"
msgstr ""
-#: src/dialogs.ycp:123 src/dialogs.ycp:137 src/dialogs.ycp:198
-#: src/dialogs.ycp:212 src/widgets.ycp:48
+#: src/dialogs.ycp:129 src/dialogs.ycp:143 src/dialogs.ycp:207
+#: src/dialogs.ycp:221 src/widgets.ycp:58
msgid "Password"
msgstr ""
-#: src/dialogs.ycp:128 src/dialogs.ycp:157 src/dialogs.ycp:203
+#: src/dialogs.ycp:134 src/dialogs.ycp:164 src/dialogs.ycp:212
msgid "Add"
msgstr ""
-#: src/dialogs.ycp:129 src/dialogs.ycp:158 src/dialogs.ycp:204
+#: src/dialogs.ycp:135 src/dialogs.ycp:165 src/dialogs.ycp:213
msgid "Edit"
msgstr ""
-#: src/dialogs.ycp:130 src/dialogs.ycp:159 src/dialogs.ycp:205
+#: src/dialogs.ycp:136 src/dialogs.ycp:166 src/dialogs.ycp:214
msgid "Delete"
msgstr ""
-#: src/dialogs.ycp:135 src/dialogs.ycp:210
+#: src/dialogs.ycp:141 src/dialogs.ycp:219
msgid "Outgoing Authentication"
msgstr ""
-#: src/dialogs.ycp:173 src/dialogs.ycp:227
+#: src/dialogs.ycp:181 src/dialogs.ycp:238
msgid "Target"
msgstr ""
-#: src/dialogs.ycp:174 src/dialogs.ycp:228
+#: src/dialogs.ycp:182 src/dialogs.ycp:239
msgid "Identifier"
msgstr ""
-#: src/dialogs.ycp:177 src/dialogs.ycp:231
+#: src/dialogs.ycp:185 src/dialogs.ycp:242
msgid "LUN"
msgstr ""
-#: src/dialogs.ycp:178 src/dialogs.ycp:232
+#: src/dialogs.ycp:186 src/dialogs.ycp:243
msgid "Path"
msgstr ""
-#: src/dialogs.ycp:252
+#: src/dialogs.ycp:261
msgid "iSCSI Target Overview"
msgstr ""
-#: src/dialogs.ycp:260 src/helps.ycp:105 src/helps.ycp:108
+#. edit target
+#. add target
+#: src/dialogs.ycp:269 src/helps.ycp:108 src/helps.ycp:112
msgid "<h1>iSCSI Target</h1>"
msgstr ""
-#: src/dialogs.ycp:279 src/dialogs.ycp:308
+#: src/dialogs.ycp:287
msgid "Add iSCSI Target"
msgstr ""
-#: src/dialogs.ycp:337
+#: src/dialogs.ycp:317 src/dialogs.ycp:347
msgid "Modify iSCSI Target"
msgstr ""
@@ -275,7 +275,7 @@
#. Ovreview dialog help 3/3
#: src/helps.ycp:70
msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
"Choose an iSCSI target to change or remove.\n"
"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
msgstr ""
@@ -305,19 +305,19 @@
"<br></p>\n"
msgstr ""
-#: src/helps.ycp:97
+#: src/helps.ycp:98
msgid "Select the type of authentication. Use <b>No Authentication</b> or one of <b>Incoming</b> and <b>Outgoing</b> (can be both together). Then insert <b>User</b> and <b>Password</b>. \n"
msgstr ""
-#: src/helps.ycp:101
+#: src/helps.ycp:103
msgid "List of offered targets. Create a new target by clicking <b>Add</b>. \n"
msgstr ""
-#: src/helps.ycp:105
+#: src/helps.ycp:108
msgid "It is possible to change the <b>Path</b> to block devices, regular files, LVM, or RAID.\n"
msgstr ""
-#: src/helps.ycp:109
+#: src/helps.ycp:113
msgid "Create a new target. Replace template values with the correct values.\n"
msgstr ""
@@ -336,35 +336,40 @@
msgid "&iSCSI Target"
msgstr ""
-#: src/widgets.ycp:50
+#: src/widgets.ycp:60
msgid "OK"
msgstr ""
-#: src/widgets.ycp:51
+#: src/widgets.ycp:61
msgid "Cancel"
msgstr ""
-#: src/widgets.ycp:108
+#. add a new item
+#: src/widgets.ycp:111
msgid "Really delete this item?"
msgstr ""
-#: src/widgets.ycp:219
+#: src/widgets.ycp:185
+msgid "Cannot use the same secret for incoming and outgoing authentication."
+msgstr ""
+
+#: src/widgets.ycp:225
msgid "The target cannot be empty."
msgstr ""
-#: src/widgets.ycp:220
+#: src/widgets.ycp:226
msgid "The target already exists."
msgstr ""
-#: src/widgets.ycp:224
+#: src/widgets.ycp:230
msgid "The logical unit definition cannot be empty."
msgstr ""
-#: src/widgets.ycp:225
+#: src/widgets.ycp:231
msgid "The logical unit already exists."
msgstr ""
-#: src/widgets.ycp:288
+#: src/widgets.ycp:299
msgid "Really delete the selected item?"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.17/src/IscsiServer.ycp new/yast2-iscsi-server-2.13.18/src/IscsiServer.ycp
--- old/yast2-iscsi-server-2.13.17/src/IscsiServer.ycp 2006-04-24 11:14:24.000000000 +0200
+++ new/yast2-iscsi-server-2.13.18/src/IscsiServer.ycp 2006-05-09 11:19:19.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: IscsiServer settings, input and output functions
* Authors: Michal Zugec
*
- * $Id: IscsiServer.ycp 30390 2006-04-24 09:14:17Z mzugec $
+ * $Id: IscsiServer.ycp 30747 2006-05-09 09:19:14Z mzugec $
*
* Representation of the configuration of iscsi-server.
* Input and output routines.
@@ -37,6 +37,7 @@
* Data was modified?
*/
global boolean modified = false;
+global boolean configured = false;
/**
*/
@@ -215,7 +216,6 @@
string lun_path = splitstring(lun[1]:"", ",")[0]:"";
// add LUN for target
string command = sformat("ietadm --op new --tid=%1 --lun=%2 --params %3", to_add, lun_num, lun_path);
-// y2internal("command: %1", command);
SCR::Execute(.target.bash_output, command, $[]);
y2milestone("lun %1,%2", lun_num, lun_path);
});
@@ -300,6 +300,7 @@
if(Abort()) return false;
modified = false;
+ configured = true;
return true;
}
@@ -368,7 +369,54 @@
* @return boolean True on success
*/
global boolean Import (map settings) {
- // TODO FIXME: your code here (fill the above mentioned variables)...
+ foreach(string key, any value, (map)settings, {
+ switch(key){
+ case("service") :
+ serviceStatus = (boolean) value;
+ break;
+ case("auth") :
+ list<string> incom = [];
+ string outgoin = "";
+ foreach(map row, (list