Hello community,
here is the log from the commit of package yast2-iscsi-server
checked in at Tue Apr 11 13:16:30 CEST 2006.
--------
--- yast2-iscsi-server/yast2-iscsi-server.changes 2006-04-07 08:31:45.000000000 +0200
+++ NOARCH/yast2-iscsi-server/yast2-iscsi-server.changes 2006-04-11 12:56:55.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 11 12:58:08 CEST 2006 - mzugec@suse.cz
+
+- fixed #157643 - reload server
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-server-2.13.14.tar.bz2
New:
----
yast2-iscsi-server-2.13.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-server.spec ++++++
--- /var/tmp/diff_new_pack.kgJQ4X/_old 2006-04-11 13:15:41.000000000 +0200
+++ /var/tmp/diff_new_pack.kgJQ4X/_new 2006-04-11 13:15:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-server (Version 2.13.14)
+# spec file for package yast2-iscsi-server (Version 2.13.15)
#
# 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.14
+Version: 2.13.15
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-server-2.13.14.tar.bz2
+Source0: yast2-iscsi-server-2.13.15.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.14
+%setup -n yast2-iscsi-server-2.13.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -64,6 +64,8 @@
%doc %{prefix}/share/doc/packages/yast2-iscsi-server
%changelog -n yast2-iscsi-server
+* Tue Apr 11 2006 - mzugec@suse.cz
+- fixed #157643 - reload server
* Fri Apr 07 2006 - mzugec@suse.cz
- fixed #163999 - iscsi target - identifier contains '\n'
* Wed Apr 05 2006 - mzugec@suse.cz
++++++ yast2-iscsi-server-2.13.14.tar.bz2 -> yast2-iscsi-server-2.13.15.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.14/VERSION new/yast2-iscsi-server-2.13.15/VERSION
--- old/yast2-iscsi-server-2.13.14/VERSION 2006-04-07 08:26:22.000000000 +0200
+++ new/yast2-iscsi-server-2.13.15/VERSION 2006-04-11 12:57:45.000000000 +0200
@@ -1 +1 @@
-2.13.14
+2.13.15
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.14/configure new/yast2-iscsi-server-2.13.15/configure
--- old/yast2-iscsi-server-2.13.14/configure 2006-04-07 08:19:41.000000000 +0200
+++ new/yast2-iscsi-server-2.13.15/configure 2006-04-11 12:50:47.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.13.
+# Generated by GNU Autoconf 2.59 for yast2-iscsi-server 2.13.14.
#
# 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.13'
-PACKAGE_STRING='yast2-iscsi-server 2.13.13'
+PACKAGE_VERSION='2.13.14'
+PACKAGE_STRING='yast2-iscsi-server 2.13.14'
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.13 to adapt to many kinds of systems.
+\`configure' configures yast2-iscsi-server 2.13.14 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.13:";;
+ short | recursive ) echo "Configuration of yast2-iscsi-server 2.13.14:";;
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.13
+yast2-iscsi-server configure 2.13.14
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.13, which was
+It was created by yast2-iscsi-server $as_me 2.13.14, 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.13'
+ VERSION='2.13.14'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.13"
+VERSION="2.13.14"
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.13, which was
+This file was extended by yast2-iscsi-server $as_me 2.13.14, 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.13
+yast2-iscsi-server config.status 2.13.14
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.14/configure.in new/yast2-iscsi-server-2.13.15/configure.in
--- old/yast2-iscsi-server-2.13.14/configure.in 2006-04-07 08:19:34.000000000 +0200
+++ new/yast2-iscsi-server-2.13.15/configure.in 2006-04-11 12:50:43.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.13, http://www.suse.de/feedback, yast2-iscsi-server)
+AC_INIT(yast2-iscsi-server, 2.13.14, 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.13"
+VERSION="2.13.14"
RPMNAME="yast2-iscsi-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.14/iscsi-server.pot new/yast2-iscsi-server-2.13.15/iscsi-server.pot
--- old/yast2-iscsi-server-2.13.14/iscsi-server.pot 2006-03-06 11:34:37.000000000 +0100
+++ new/yast2-iscsi-server-2.13.15/iscsi-server.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,379 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 11:34+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/IscsiServer.ycp:235
-#, ycp-format
-msgid "<p>To configure the iSCSI Target, the <b>%1</b> package must be installed.</p>"
-msgstr ""
-
-#: src/IscsiServer.ycp:236
-msgid "<p>Install it now?</p>"
-msgstr ""
-
-#. IscsiServer read dialog caption
-#: src/IscsiServer.ycp:265
-msgid "Initializing iSCSI Target Configuration"
-msgstr ""
-
-#. Progress stage 1/3
-#: src/IscsiServer.ycp:277
-msgid "Read the database"
-msgstr ""
-
-#. Progress stage 2/3
-#: src/IscsiServer.ycp:279
-msgid "Read the previous settings"
-msgstr ""
-
-#. Progress stage 3/3
-#: src/IscsiServer.ycp:281
-msgid "Detect the devices"
-msgstr ""
-
-#. Progress step 1/3
-#: src/IscsiServer.ycp:284
-msgid "Reading the database..."
-msgstr ""
-
-#. Progress step 2/3
-#: src/IscsiServer.ycp:286
-msgid "Reading the previous settings..."
-msgstr ""
-
-#. Progress step 3/3
-#: src/IscsiServer.ycp:288
-msgid "Detecting the devices..."
-msgstr ""
-
-#. Progress finished
-#: src/IscsiServer.ycp:290 src/IscsiServer.ycp:368
-msgid "Finished"
-msgstr ""
-
-#. IscsiServer read dialog caption
-#: src/IscsiServer.ycp:347
-msgid "Saving iSCSI Target Configuration"
-msgstr ""
-
-#. Progress stage 1/2
-#: src/IscsiServer.ycp:359
-msgid "Write the settings"
-msgstr ""
-
-#. Progress stage 2/2
-#: src/IscsiServer.ycp:361
-msgid "Run SuSEconfig"
-msgstr ""
-
-#. Progress step 1/2
-#: src/IscsiServer.ycp:364
-msgid "Writing the settings..."
-msgstr ""
-
-#. Progress step 2/2
-#: src/IscsiServer.ycp:366
-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
-msgid "Cannot write settings."
-msgstr ""
-
-#. TODO FIXME: your code here...
-#. Configuration summary text for autoyast
-#: src/IscsiServer.ycp:436
-msgid "Configuration summary..."
-msgstr ""
-
-#: src/dialogs.ycp:31
-msgid "Service"
-msgstr ""
-
-#: src/dialogs.ycp:52
-msgid "Global"
-msgstr ""
-
-#: src/dialogs.ycp:71 src/dialogs.ycp:153
-msgid "Targets"
-msgstr ""
-
-#. radio button (starting SLP service - option 1)
-#: src/dialogs.ycp:99
-msgid "When &Booting"
-msgstr ""
-
-#. radio button (starting SLP service - option 2)
-#: src/dialogs.ycp:101
-msgid "&Manually"
-msgstr ""
-
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/dialogs.ycp:104
-msgid "When Booting"
-msgstr ""
-
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/dialogs.ycp:106
-msgid "Manually"
-msgstr ""
-
-#: src/dialogs.ycp:118 src/dialogs.ycp:193
-msgid "No Authentication"
-msgstr ""
-
-#: src/dialogs.ycp:120 src/dialogs.ycp:195
-msgid "Incoming Authentication"
-msgstr ""
-
-#: src/dialogs.ycp:123 src/dialogs.ycp:137 src/dialogs.ycp:198
-#: src/dialogs.ycp:212 src/widgets.ycp:47
-msgid "Username"
-msgstr ""
-
-#: src/dialogs.ycp:123 src/dialogs.ycp:137 src/dialogs.ycp:198
-#: src/dialogs.ycp:212 src/widgets.ycp:48
-msgid "Password"
-msgstr ""
-
-#: src/dialogs.ycp:128 src/dialogs.ycp:157 src/dialogs.ycp:203
-msgid "Add"
-msgstr ""
-
-#: src/dialogs.ycp:129 src/dialogs.ycp:158 src/dialogs.ycp:204
-msgid "Edit"
-msgstr ""
-
-#: src/dialogs.ycp:130 src/dialogs.ycp:159 src/dialogs.ycp:205
-msgid "Delete"
-msgstr ""
-
-#: src/dialogs.ycp:135 src/dialogs.ycp:210
-msgid "Outgoing Authentication"
-msgstr ""
-
-#: src/dialogs.ycp:173 src/dialogs.ycp:227
-msgid "Target"
-msgstr ""
-
-#: src/dialogs.ycp:174 src/dialogs.ycp:228
-msgid "Identifier"
-msgstr ""
-
-#: src/dialogs.ycp:177 src/dialogs.ycp:231
-msgid "LUN"
-msgstr ""
-
-#: src/dialogs.ycp:178 src/dialogs.ycp:232
-msgid "Path"
-msgstr ""
-
-#: src/dialogs.ycp:252
-msgid "iSCSI Target Overview"
-msgstr ""
-
-#: src/dialogs.ycp:260 src/helps.ycp:105 src/helps.ycp:108
-msgid "<h1>iSCSI Target</h1>"
-msgstr ""
-
-#: src/dialogs.ycp:279 src/dialogs.ycp:308
-msgid "Add iSCSI Target"
-msgstr ""
-
-#: src/dialogs.ycp:337
-msgid "Modify iSCSI Target"
-msgstr ""
-
-#. Read dialog help 1/2
-#: src/helps.ycp:20
-msgid ""
-"<p><b><big>Initializing iSCSI Target Configuration</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-
-#. Read dialog help 2/2
-#: src/helps.ycp:25
-msgid ""
-"<p><b><big>Aborting Initialization</big></b><br>\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
-msgstr ""
-
-#. Write dialog help 1/2
-#: src/helps.ycp:30
-msgid ""
-"<p><b><big>Saving iSCSI Target Configuration</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-
-#. Write dialog help 2/2
-#: src/helps.ycp:35
-msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>\n"
-"Abort the save procedure by pressing <b>Abort</b>.\n"
-"An additional dialog informs whether it is safe to do so.\n"
-"</p>\n"
-msgstr ""
-
-#. Summary dialog help 1/3
-#: src/helps.ycp:42
-msgid ""
-"<p><b><big>iSCSI Target Configuration</big></b><br>\n"
-"Configure an iSCSI target here.<br></p>\n"
-msgstr ""
-
-#. Summary dialog help 2/3
-#: src/helps.ycp:47
-msgid ""
-"<p><b><big>Adding an iSCSI Target</big></b><br>\n"
-"Choose an iSCSI target from the list of detected iSCSI targets.\n"
-"If your target was not detected, use <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>\n"
-msgstr ""
-
-#. Summary dialog help 3/3
-#: src/helps.ycp:54
-msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>\n"
-"If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>\n"
-msgstr ""
-
-#. Ovreview dialog help 1/3
-#: src/helps.ycp:60
-msgid ""
-"<p><b><big>iSCSI Target Configuration Overview</big></b><br>\n"
-"Obtain an overview of installed iSCSI targets. Additionally\n"
-"edit their configurations.<br></p>\n"
-msgstr ""
-
-#. Ovreview dialog help 2/3
-#: src/helps.ycp:66
-msgid ""
-"<p><b><big>Adding an iSCSI Target</big></b><br>\n"
-"Press <b>Add</b> to configure an iSCSI target.</p>"
-msgstr ""
-
-#. Ovreview dialog help 3/3
-#: src/helps.ycp:70
-msgid ""
-"<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 ""
-
-#. Configure1 dialog help 1/2
-#: src/helps.ycp:76
-msgid ""
-"<p><b><big>Configuration Part One</big></b><br>\n"
-"Press <b>Next</b> to continue.\n"
-"<br></p>"
-msgstr ""
-
-#. Configure1 dialog help 2/2
-#. Configure2 dialog help 2/2
-#: src/helps.ycp:81 src/helps.ycp:92
-msgid ""
-"<p><b><big>Selecting Something</big></b><br>\n"
-"It is not possible. You must code it first. :-)\n"
-"</p>"
-msgstr ""
-
-#. Configure2 dialog help 1/2
-#: src/helps.ycp:86
-msgid ""
-"<p><b><big>Configuration Part Two</big></b><br>\n"
-"Press <b>Next</b> to continue.\n"
-"<br></p>\n"
-msgstr ""
-
-#: src/helps.ycp:97
-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
-msgid "List of offered targets. Create a new target by clicking <b>Add</b>. \n"
-msgstr ""
-
-#: src/helps.ycp:105
-msgid "It is possible to change the <b>Path</b> to block devices, regular files, LVM, or RAID.\n"
-msgstr ""
-
-#: src/helps.ycp:109
-msgid "Create a new target. Replace template values with the correct values.\n"
-msgstr ""
-
-#. Command line help text for the Xiscsi-server module
-#: src/iscsi-server.ycp:34
-msgid "Configuration of an iSCSI target"
-msgstr ""
-
-#. Rich text title for IscsiServer in proposals
-#: src/iscsi-server_proposal.ycp:65
-msgid "iSCSI Target"
-msgstr ""
-
-#. Menu title for IscsiServer in proposals
-#: src/iscsi-server_proposal.ycp:67
-msgid "&iSCSI Target"
-msgstr ""
-
-#: src/widgets.ycp:50
-msgid "OK"
-msgstr ""
-
-#: src/widgets.ycp:51
-msgid "Cancel"
-msgstr ""
-
-#: src/widgets.ycp:108
-msgid "Really delete this item?"
-msgstr ""
-
-#: src/widgets.ycp:219
-msgid "The target cannot be empty."
-msgstr ""
-
-#: src/widgets.ycp:220
-msgid "The target already exists."
-msgstr ""
-
-#: src/widgets.ycp:224
-msgid "The logical unit definition cannot be empty."
-msgstr ""
-
-#: src/widgets.ycp:225
-msgid "The logical unit already exists."
-msgstr ""
-
-#: src/widgets.ycp:288
-msgid "Really delete the selected item?"
-msgstr ""
-
-#. Initialization dialog caption
-#: src/wizards.ycp:110
-msgid "iSCSI Target Configuration"
-msgstr ""
-
-#. Initialization dialog contents
-#: src/wizards.ycp:112
-msgid "Initializing..."
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-server-2.13.14/src/IscsiServer.ycp new/yast2-iscsi-server-2.13.15/src/IscsiServer.ycp
--- old/yast2-iscsi-server-2.13.14/src/IscsiServer.ycp 2006-04-07 08:27:40.000000000 +0200
+++ new/yast2-iscsi-server-2.13.15/src/IscsiServer.ycp 2006-04-11 13:03:09.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: IscsiServer settings, input and output functions
* Authors: Michal Zugec
*
- * $Id: IscsiServer.ycp 29851 2006-04-07 06:27:34Z mzugec $
+ * $Id: IscsiServer.ycp 29975 2006-04-11 10:55:25Z mzugec $
*
* Representation of the configuration of iscsi-server.
* Input and output routines.
@@ -147,15 +147,23 @@
"Restart the iscsitarget service?"
))) Service::Restart("iscsitarget");
else {
-/*
map changes = IscsiServerFunctions::getChanges();
- y2internal("changes %1", changes);
+ list<string> connected = IscsiServerFunctions::getConnected();
+
+ foreach(string key,any value, IscsiServerFunctions::getTargets(), {
+ if ((!contains(connected, key))&&(!contains(changes["add"]:[], key))&&(!contains(changes["del"]:[], key))){
+ changes["del"] = add (changes["del"]:[], key);
+ changes["add"] = add (changes["add"]:[], key);
+ y2milestone("modified key %1", key);
+ }
+ });
foreach(string row, changes["del"]:[], {
y2internal("to delete %1", row);
- string target=((map)SCR::Execute(.target.bash_output,
+ string target=((map)SCR::Execute(.target.bash_output,
"cat /proc/net/iet/volume|grep $TARGET", $["TARGET":row]))["stdout"]:"" ;
string to_delete = splitstring( splitstring(target, " ")[0]:"", ":")[1]:"";
+ y2internal("to delete %1", to_delete);
SCR::Execute(.target.bash_output, "ietadm --op delete --tid=$TID", $["TID":to_delete]);
});
@@ -165,18 +173,28 @@
string target=((map)SCR::Execute(.target.bash_output,
"cat /proc/net/iet/volume|grep $TARGET", $["TARGET":row]))["stdout"]:"" ;
string to_add = splitstring( splitstring(target, " ")[0]:"", ":")[1]:"";
- y2internal("to add %1", to_add);
list<string> lun = [];
+ list <string> secret = [];
foreach( map conf_row, (list