Hello community,
here is the log from the commit of package yast2-iscsi-client
checked in at Wed Nov 21 03:26:29 CET 2007.
--------
--- yast2-iscsi-client/yast2-iscsi-client.changes 2007-11-16 16:28:56.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-iscsi-client/yast2-iscsi-client.changes 2007-11-20 16:10:09.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 20 16:08:50 CET 2007 - mzugec@suse.cz
+
+- moved some functions to IscsiClientLib
+- 2.16.2
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-2.16.1.tar.bz2
New:
----
yast2-iscsi-client-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.Vi9183/_old 2007-11-21 03:26:16.000000000 +0100
+++ /var/tmp/diff_new_pack.Vi9183/_new 2007-11-21 03:26:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-iscsi-client (Version 2.16.1)
+# spec file for package yast2-iscsi-client (Version 2.16.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.16.1
-Release: 3
+Version: 2.16.2
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-iscsi-client-2.16.1.tar.bz2
+Source0: yast2-iscsi-client-2.16.2.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-perl-bindings yast2-testsuite
Requires: yast2 yast2-packager
@@ -29,7 +29,7 @@
%prep
-%setup -n yast2-iscsi-client-2.16.1
+%setup -n yast2-iscsi-client-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -60,10 +60,14 @@
/usr/share/YaST2/clients/iscsi-client_*.ycp
/usr/share/YaST2/clients/inst_iscsi-client.ycp
/usr/share/YaST2/modules/IscsiClient.*
+/usr/share/YaST2/modules/IscsiClientLib.*
%{prefix}/share/applications/YaST2/iscsi-client.desktop
/usr/share/YaST2/scrconf/iscsid.scr
%doc %{prefix}/share/doc/packages/yast2-iscsi-client
%changelog
+* Tue Nov 20 2007 - mzugec@suse.cz
+- moved some functions to IscsiClientLib
+- 2.16.2
* Fri Nov 16 2007 - mzugec@suse.cz
- fixed autoyast export
* Wed Nov 14 2007 - mzugec@suse.cz
++++++ yast2-iscsi-client-2.16.1.tar.bz2 -> yast2-iscsi-client-2.16.2.tar.bz2 ++++++
++++ 1644 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.16.1/configure.in new/yast2-iscsi-client-2.16.2/configure.in
--- old/yast2-iscsi-client-2.16.1/configure.in 2007-11-14 13:21:45.000000000 +0100
+++ new/yast2-iscsi-client-2.16.2/configure.in 2007-11-20 16:06:42.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-iscsi-client, 2.16.0, http://bugs.opensuse.org/, yast2-iscsi-client)
+AC_INIT(yast2-iscsi-client, 2.16.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.16.0"
+VERSION="2.16.1"
RPMNAME="yast2-iscsi-client"
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-client-2.16.1/src/complex.ycp new/yast2-iscsi-client-2.16.2/src/complex.ycp
--- old/yast2-iscsi-client-2.16.1/src/complex.ycp 2007-10-29 10:02:19.000000000 +0100
+++ new/yast2-iscsi-client-2.16.2/src/complex.ycp 2007-11-20 16:09:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Michal Zugec
*
- * $Id: complex.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: complex.ycp 42224 2007-11-20 15:09:31Z mzugec $
*/
{
@@ -16,6 +16,7 @@
import "Wizard";
import "Wizard_hw";
import "IscsiClient";
+import "IscsiClientLib";
include "iscsi-client/helps.ycp";
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.16.1/src/dialogs.ycp new/yast2-iscsi-client-2.16.2/src/dialogs.ycp
--- old/yast2-iscsi-client-2.16.1/src/dialogs.ycp 2007-10-29 10:02:19.000000000 +0100
+++ new/yast2-iscsi-client-2.16.2/src/dialogs.ycp 2007-11-20 16:09:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Michal Zugec
*
- * $Id: dialogs.ycp 39753 2007-07-27 15:25:13Z mzugec $
+ * $Id: dialogs.ycp 42224 2007-11-20 15:09:31Z mzugec $
*/
{
@@ -27,8 +27,8 @@
map > widgets = $[
"auto_start_up" : CWMServiceStart::CreateAutoStartWidget ($[
- "get_service_auto_start" : IscsiClient::GetStartService,
- "set_service_auto_start" : IscsiClient::SetStartService,
+ "get_service_auto_start" : IscsiClientLib::GetStartService,
+ "set_service_auto_start" : IscsiClientLib::SetStartService,
// radio button (starting SLP service - option 1)
"start_auto_button" : _("When &Booting"),
// radio button (starting SLP service - option 2)
@@ -281,7 +281,7 @@
list tab_order = ["general", "client"];
if (!Stage::initial()) tab_order = add(tab_order, "discovered");
- if (size(IscsiClient::getiBFT())>0) tab_order = add(tab_order, "ibft");
+ if (size(IscsiClientLib::getiBFT())>0) tab_order = add(tab_order, "ibft");
map widget_descr = $[
"tab": CWMTab::CreateWidget($[
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.16.1/src/inst_iscsi-client.ycp new/yast2-iscsi-client-2.16.2/src/inst_iscsi-client.ycp
--- old/yast2-iscsi-client-2.16.1/src/inst_iscsi-client.ycp 2007-10-29 10:02:19.000000000 +0100
+++ new/yast2-iscsi-client-2.16.2/src/inst_iscsi-client.ycp 2007-11-20 16:09:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Michal Zugec
*
- * $Id: inst_iscsi-client.ycp 37936 2007-05-11 14:06:22Z mzugec $
+ * $Id: inst_iscsi-client.ycp 42224 2007-11-20 15:09:31Z mzugec $
*
* Main file for iscsi-client configuration. Uses all other files.
*/
@@ -37,14 +37,14 @@
SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi");
// check initiator name, create if not exists
//WFM::Execute (.local.bash,"test -d /etc/iscsi/ && /bin/cp -a /etc/iscsi/* " + String::Quote(Installation::destdir) + "/etc/iscsi/");
-IscsiClient::checkInitiatorName();
+IscsiClientLib::checkInitiatorName();
ModuleLoading::Load("iscsi_tcp", "", "", "", false, true);
// start daemon before
SCR::Execute(.background.run_output_err, "iscsid");
-if (size(IscsiClient::getiBFT())>0) IscsiClient::autoLogOn();
+if (size(IscsiClientLib::getiBFT())>0) IscsiClientLib::autoLogOn();
// run dialog
ret = MainSequence();
y2debug("MainSequence ret=%1", ret);
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.16.1/src/iscsi-client_auto.ycp new/yast2-iscsi-client-2.16.2/src/iscsi-client_auto.ycp
--- old/yast2-iscsi-client-2.16.1/src/iscsi-client_auto.ycp 2007-11-16 16:26:04.000000000 +0100
+++ new/yast2-iscsi-client-2.16.2/src/iscsi-client_auto.ycp 2007-11-20 16:09:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Michal Zugec
*
- * $Id: iscsi-client_auto.ycp 42129 2007-11-16 15:26:03Z mzugec $
+ * $Id: iscsi-client_auto.ycp 42224 2007-11-20 15:09:31Z mzugec $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -27,6 +27,7 @@
y2milestone("IscsiClient auto started");
import "IscsiClient";
+import "ModuleLoading";
include "iscsi-client/wizards.ycp";
any ret = nil;
@@ -86,6 +87,7 @@
import "Progress";
boolean progress_orig = Progress::set (false);
IscsiClient::write_only = true;
+ ModuleLoading::Load("iscsi_tcp", "", "", "", false, true);
ret = IscsiClient::Write();
Progress::set (progress_orig);
}
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.16.1/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.16.2/src/IscsiClientLib.ycp
--- old/yast2-iscsi-client-2.16.1/src/IscsiClientLib.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-iscsi-client-2.16.2/src/IscsiClientLib.ycp 2007-11-20 15:51:01.000000000 +0100
@@ -0,0 +1,466 @@
+{
+module "IscsiClientLib";
+textdomain "iscsi-client";
+
+import "Service";
+import "Popup";
+
+global list <string> sessions = [];
+global list <string> discovered = [];
+global list <string> targets = [];
+
+// status of rcopen-iscsi service
+boolean serviceStatus = false;
+// main configuration file (/etc/iscsi/iscsid.conf)
+map config = $[];
+// iBFT (iSCSI Boot Firmware Table)
+map ibft = nil;
+// InitiatorName file (/etc/iscsi/initiatorname.iscsi)
+global string initiatorname = "";
+// map used for autoYaST
+global map ay_settings=nil;
+
+/**
+ * get iBFT (available only on some special hardware)
+ */
+global map getiBFT(){
+ if (ibft==nil){
+ ibft=$[];
+ string from_bios = ((map)SCR::Execute(.target.bash_output, "fwparam_ibft -b"))["stdout"]:"";
+ foreach(string row, splitstring(from_bios, "\n"), {
+ list<string> key_val=splitstring(row, "=");
+ if (size(key_val[0]:"")>0) ibft[key_val[0]:""] = key_val[1]:"";
+ });
+ }
+ y2milestone("iBFT %1", ibft);
+ return ibft;
+}
+
+
+// get accessor for service status
+global boolean GetStartService() {
+ boolean status = Service::Enabled("open-iscsi");
+ y2milestone("Status of open-iscsi %1", status);
+ return status;
+}
+
+// set accessor for service status
+global void SetStartService(boolean status) {
+ y2milestone("Set status of open-iscsi to %1", status);
+ if (status == true) Service::Enable("open-iscsi");
+ else Service::Disable("open-iscsi");
+}
+
+
+// read configuration file
+global list