Hello community,
here is the log from the commit of package yast2-fcoe-client for
openSUSE:Factory checked in at 2012-04-17 22:03:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-fcoe-client", Maintainer is "g...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes
2012-01-25 11:09:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes
2012-04-17 22:04:45.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 29 14:39:33 CEST 2012 - jsuch...@suse.cz
+
+- merged proofread texts
+- V 2.22.3
+
+-------------------------------------------------------------------
Old:
----
yast2-fcoe-client-2.22.2.tar.bz2
New:
----
yast2-fcoe-client-2.22.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-fcoe-client.spec ++++++
--- /var/tmp/diff_new_pack.4fZvVq/_old 2012-04-17 22:04:47.000000000 +0200
+++ /var/tmp/diff_new_pack.4fZvVq/_new 2012-04-17 22:04:47.000000000 +0200
@@ -18,7 +18,7 @@
Name: yast2-fcoe-client
-Version: 2.22.2
+Version: 2.22.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-fcoe-client-2.22.2.tar.bz2 -> yast2-fcoe-client-2.22.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-2.22.2/VERSION
new/yast2-fcoe-client-2.22.3/VERSION
--- old/yast2-fcoe-client-2.22.2/VERSION 2012-01-19 09:49:35.000000000
+0100
+++ new/yast2-fcoe-client-2.22.3/VERSION 2012-04-17 12:22:26.000000000
+0200
@@ -1 +1 @@
-2.22.2
+2.22.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-2.22.2/configure
new/yast2-fcoe-client-2.22.3/configure
--- old/yast2-fcoe-client-2.22.2/configure 2012-01-24 11:55:03.000000000
+0100
+++ new/yast2-fcoe-client-2.22.3/configure 2012-04-17 12:23:48.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-fcoe-client 2.22.2.
+# Generated by GNU Autoconf 2.68 for yast2-fcoe-client 2.22.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-fcoe-client'
PACKAGE_TARNAME='yast2-fcoe-client'
-PACKAGE_VERSION='2.22.2'
-PACKAGE_STRING='yast2-fcoe-client 2.22.2'
+PACKAGE_VERSION='2.22.3'
+PACKAGE_STRING='yast2-fcoe-client 2.22.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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-fcoe-client 2.22.2 to adapt to many kinds of
systems.
+\`configure' configures yast2-fcoe-client 2.22.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-fcoe-client 2.22.2:";;
+ short | recursive ) echo "Configuration of yast2-fcoe-client 2.22.3:";;
esac
cat <<\_ACEOF
@@ -1381,7 +1381,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-fcoe-client configure 2.22.2
+yast2-fcoe-client configure 2.22.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1398,7 +1398,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-fcoe-client $as_me 2.22.2, which was
+It was created by yast2-fcoe-client $as_me 2.22.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2328,7 +2328,7 @@
# Define the identity of the package.
PACKAGE='yast2-fcoe-client'
- VERSION='2.22.2'
+ VERSION='2.22.3'
cat >>confdefs.h <<_ACEOF
@@ -2450,7 +2450,7 @@
-VERSION="2.22.2"
+VERSION="2.22.3"
RPMNAME="yast2-fcoe-client"
MAINTAINER="Gabriele Mohr <g...@suse.de>"
@@ -3380,7 +3380,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-fcoe-client $as_me 2.22.2, which was
+This file was extended by yast2-fcoe-client $as_me 2.22.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3433,7 +3433,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-fcoe-client config.status 2.22.2
+yast2-fcoe-client config.status 2.22.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-2.22.2/configure.in
new/yast2-fcoe-client-2.22.3/configure.in
--- old/yast2-fcoe-client-2.22.2/configure.in 2012-01-24 11:54:58.000000000
+0100
+++ new/yast2-fcoe-client-2.22.3/configure.in 2012-04-17 12:23:45.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-fcoe-client, 2.22.2, http://bugs.opensuse.org/,
yast2-fcoe-client)
+AC_INIT(yast2-fcoe-client, 2.22.3, http://bugs.opensuse.org/,
yast2-fcoe-client)
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.22.2"
+VERSION="2.22.3"
RPMNAME="yast2-fcoe-client"
MAINTAINER="Gabriele Mohr <g...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-2.22.2/src/FcoeClient.ycp
new/yast2-fcoe-client-2.22.3/src/FcoeClient.ycp
--- old/yast2-fcoe-client-2.22.2/src/FcoeClient.ycp 2012-01-18
14:04:19.000000000 +0100
+++ new/yast2-fcoe-client-2.22.3/src/FcoeClient.ycp 2012-04-17
09:00:31.000000000 +0200
@@ -53,15 +53,28 @@
global boolean Modified();
/**
- * Data was modified?
+ * Data
+ */
+
+/**
+ * data modified?
*/
boolean modified = false;
/**
+ * proposal valid?
*/
boolean proposal_valid = false;
/**
+ * Number of retries for fipvlan (default is 20).
+ * The number is reduced to 10 to make detection faster. 10 seconds (10
retries *
+ * 1000 ms) should be enough time for most interfaces. If not there is the
+ * possibility to retry interface dedection using 'Retry'.
+ */
+string number_of_retries = "10";
+
+/**
* Write only, used during autoinstallation.
* Don't run services and SuSEconfig, it's all done at one place.
*/
@@ -292,7 +305,10 @@
// to be able to detect DCB state afterwards (see bnc #737683)
string vlan_cmd = "LANG=POSIX fipvlan -u";
map vlan_info = $[];
-
+
+ if ( !Mode::autoinst() )
+ vlan_cmd = vlan_cmd + " -l " + FcoeClient::number_of_retries; //
reduce number of retries
+
foreach ( string dev, (list<string>)net_devices, {
vlan_cmd = vlan_cmd + " " + dev;
} );
@@ -361,11 +377,12 @@
// Create /etc/fcoe/cfg-<if> or /etc/fcoe/cfg-<if>.<vlan>
// (depending on AUTO_VLAN setting)
//
-global void CreateFcoeConfig( string vlan_device_name, map netcard )
+global map<string, string> CreateFcoeConfig( string vlan_device_name, map
netcard )
{
string file_name = "";
boolean file_exists = false;
-
+ map <string, string> status_map = $[];
+
// if AUTO_VLAN is set to "yes"
if ( netcard["auto_vlan"]:"no" == "yes" )
{
@@ -413,6 +430,11 @@
if ( file_exists )
{
AddRevertCommand( sformat( "rm %1", file_name ) );
+ // fill status map
+ status_map = add( status_map, "FCOE_ENABLE",
netcard["fcoe_enable"]:"yes");
+ status_map = add( status_map, "DCB_REQUIRED",
netcard["dcb_required"]:"no");
+ status_map = add( status_map, "AUTO_VLAN",
netcard["auto_vlan"]:"no");
+ status_map = add( status_map, "cfg_device", file_name );
}
else
{
@@ -423,6 +445,8 @@
{
y2error( "Cannot read /etc/fcoe/cfg-ethx" );
}
+
+ return status_map;
}
//
@@ -929,7 +953,7 @@
/* Progress stage 3/3 */
_("Detect network cards"),
/* Progress stage 4/4 */
- _("Read /etc/fcoe/config" )
+ _("Read /etc/fcoe/config")
], [
/* Progress step 1/3 */
_("Checking for installed
packages..."),
@@ -938,7 +962,7 @@
/* Progress step 3/3 */
_("Detecting network cards..."),
/* Progress step 4/4 */
- _("Reading /etc/fcoe/config" ),
+ _("Reading /etc/fcoe/config"),
/* Progress finished */
_("Finished")
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-2.22.2/src/complex.ycp
new/yast2-fcoe-client-2.22.3/src/complex.ycp
--- old/yast2-fcoe-client-2.22.2/src/complex.ycp 2012-01-18
14:03:58.000000000 +0100
+++ new/yast2-fcoe-client-2.22.3/src/complex.ycp 2012-04-17
09:00:31.000000000 +0200
@@ -178,9 +178,8 @@
}
}
-
-void InitInterfacesDialog (string id) {
- y2milestone( "Init interfaces dialog" );
+void ShowInterfaces()
+{
string vlan_interface = "";
integer row = 0;
@@ -200,9 +199,17 @@
UI::ChangeWidget( `id(`interfaces), `Items, table_items );
// set current item
UI::ChangeWidget( `id(`interfaces), `CurrentItem, `id(0) );
+
FcoeClient::current_card = 0;
+}
+
+void InitInterfacesDialog (string id) {
+ y2milestone( "Init interfaces dialog" );
+
+ ShowInterfaces();
AdjustButtons();
+
}
//
@@ -276,6 +283,12 @@
FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces),
`CurrentItem );
AdjustButtons();
}
+ else if ( action == `retry )
+ {
+ FcoeClient::ResetNetworkCards();
+ FcoeClient::DetectNetworkCards();
+ ShowInterfaces();
+ }
else if ( action == `create )
{
// haendel:~/:[0]# fipvlan -c -s eth3
@@ -288,9 +301,9 @@
map card = FcoeClient::GetCurrentNetworkCard();
string dev_name = card["dev_name"]:"";
-
- string command = "";
- map output = $[];
+ string command = sformat( "fipvlan -c -s %1", dev_name );
+
+ map output = $[];
string fcoe_vlan_interface = "";
map status_map = $[];
@@ -306,9 +319,9 @@
{
if ( Stage::initial() ) // first stage of installation - create
and start FCoE VLAN interface
{
- // create and start FCoE e.g. 'fipvlan -c -s eth3'
- command = sformat( "fipvlan -c -s %1", dev_name );
- y2milestone( "Executing command: %1", command );
+ // execute command, e.g. 'fipvlan -c -s eth3'
+
+ y2milestone( "Executing command: %1", command );
output = (map)SCR::Execute( .target.bash_output, command );
y2milestone( "Output: %1", output );
@@ -321,9 +334,6 @@
}
else // installed system - if VLAN already exists only start
FCoE
{
- // create and start FCoE
- command = sformat( "fipvlan -c -s %1", dev_name );
-
// if /etc/sysconfig/network/ifcfg-<if>.<vlan> already exists
// call 'ifup' for the interface (creates
/proc/net/vlan/<if>.<vlan>)
if ( FileUtils::Exists( ifcfg_file ) )
@@ -364,8 +374,7 @@
{
y2milestone( "FCoE VLAN interface %1 created/started",
fcoe_vlan_interface );
// write config for FCoE VLAN interface
- FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card );
- status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface,
card["dev_name"]:"" );
+ status_map = FcoeClient::CreateFcoeConfig( fcoe_vlan_interface,
card );
// command to be able to revert the creation of FCoE VLAN interface
in case of 'Cancel'
// FcoeClient::AddRevertCommand( sformat("fcoeadm -d %1 && vconfig
rem %2", status_map["cfg_device"]:"", fcoe_vlan_interface ) );
@@ -474,7 +483,7 @@
}
else
{
- Popup::Error( sformat( _("Removing of interface %1
failed"), card["fcoe_vlan"]:"") );
+ Popup::Error( sformat( _("Removing of interface %1
failed."), card["fcoe_vlan"]:"") );
y2error( "Removing of interface %1 failed",
card["fcoe_vlan"]:"" );
}
}
@@ -531,8 +540,8 @@
if ( fcoe_auto && !lldpad_auto )
{
// text of an information (notify) popup
- Popup::Notify( _( "Service 'fcoe' requires enabled service 'lldpad'.
-Enabling start on boot of service 'lldpad'." ) );
+ Popup::Notify( _("Service 'fcoe' requires enabled service 'lldpad'.
+Enabling start on boot of service 'lldpad'.") );
lldpad_auto = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-2.22.2/src/dialogs.ycp
new/yast2-fcoe-client-2.22.3/src/dialogs.ycp
--- old/yast2-fcoe-client-2.22.2/src/dialogs.ycp 2011-10-11
13:02:24.000000000 +0200
+++ new/yast2-fcoe-client-2.22.3/src/dialogs.ycp 2012-03-15
15:15:03.000000000 +0100
@@ -140,8 +140,9 @@
[]
),
// button labels
- `Left(`HBox( `PushButton(`id(`edit), _("Change
&Settings")),
- `PushButton(`id(`create), _("Create
FCoE &VLAN Interface")),
+ `Left(`HBox( `PushButton(`id(`retry), _("Retry
&Detection")),
+ `PushButton(`id(`edit), _("Change
&Settings")),
+ `PushButton(`id(`create), _("Create
&FCoE Interface")),
`PushButton(`id(`remove), _("&Remove
Interface")) )
)
)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
