Hello community,
here is the log from the commit of package yast2-network
checked in at Mon Oct 6 16:02:03 CEST 2008.
--------
--- yast2-network/yast2-network.changes 2008-09-25 19:53:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-10-06 15:01:43.000000000 +0200
@@ -1,0 +2,37 @@
+Mon Oct 6 14:08:39 CEST 2008 - mzugec@suse.de
+
+- added support for HSI (s390) devices (fate#304938)
+- 2.17.37
+
+-------------------------------------------------------------------
+Mon Oct 6 13:26:49 CEST 2008 - visnov@suse.cz
+
+- adapt to new Confirm::Detection API (bnc #431276)
+
+-------------------------------------------------------------------
+Sat Oct 4 11:25:21 CEST 2008 - mzugec@suse.de
+
+- adapt yast to configure network devices on s390 using udev
+ (fate#304938)
+- 2.17.36
+
+-------------------------------------------------------------------
+Thu Oct 2 21:21:38 CEST 2008 - mzugec@suse.de
+
+- check NM plugin after network is up (bnc#427374)
+- 2.17.35
+
+-------------------------------------------------------------------
+Wed Oct 1 15:57:16 CEST 2008 - mzugec@suse.de
+
+- use rpcbind instead of portmap for nfs installation (bnc#423026)
+- 2.17.34
+
+-------------------------------------------------------------------
+Wed Oct 1 14:13:17 CEST 2008 - mzugec@suse.de
+
+- use Service::Restart instead of bash agent
+- don't restart network twice in Lan::Write()
+- 2.17.33
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.17.32.tar.bz2
New:
----
yast2-network-2.17.37.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.U14381/_old 2008-10-06 16:01:34.000000000 +0200
+++ /var/tmp/diff_new_pack.U14381/_new 2008-10-06 16:01:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.17.32)
+# spec file for package yast2-network (Version 2.17.37)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-network
-Version: 2.17.32
+Version: 2.17.37
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.17.32.tar.bz2
+Source0: yast2-network-2.17.37.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -79,7 +79,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.17.32
+%setup -n yast2-network-2.17.37
%build
%{prefix}/bin/y2tool y2autoconf
@@ -143,6 +143,25 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Mon Oct 06 2008 mzugec@suse.de
+- added support for HSI (s390) devices (fate#304938)
+- 2.17.37
+* Mon Oct 06 2008 visnov@suse.cz
+- adapt to new Confirm::Detection API (bnc #431276)
+* Sat Oct 04 2008 mzugec@suse.de
+- adapt yast to configure network devices on s390 using udev
+ (fate#304938)
+- 2.17.36
+* Thu Oct 02 2008 mzugec@suse.de
+- check NM plugin after network is up (bnc#427374)
+- 2.17.35
+* Wed Oct 01 2008 mzugec@suse.de
+- use rpcbind instead of portmap for nfs installation (bnc#423026)
+- 2.17.34
+* Wed Oct 01 2008 mzugec@suse.de
+- use Service::Restart instead of bash agent
+- don't restart network twice in Lan::Write()
+- 2.17.33
* Thu Sep 25 2008 mzugec@suse.de
- copy udev files for s390 (bnc#422150)
- 2.17.32
++++++ yast2-network-2.17.32.tar.bz2 -> yast2-network-2.17.37.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/configure new/yast2-network-2.17.37/configure
--- old/yast2-network-2.17.32/configure 2008-09-23 01:48:55.000000000 +0200
+++ new/yast2-network-2.17.37/configure 2008-10-06 14:33:39.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-network 2.17.31.
+# Generated by GNU Autoconf 2.63 for yast2-network 2.17.37.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.17.31'
-PACKAGE_STRING='yast2-network 2.17.31'
+PACKAGE_VERSION='2.17.37'
+PACKAGE_STRING='yast2-network 2.17.37'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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-network 2.17.31 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.17.37 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.17.31:";;
+ short | recursive ) echo "Configuration of yast2-network 2.17.37:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.17.31
+yast2-network configure 2.17.37
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,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-network $as_me 2.17.31, which was
+It was created by yast2-network $as_me 2.17.37, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.17.31'
+ VERSION='2.17.37'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.17.31"
+VERSION="2.17.37"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3451,7 +3451,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.17.31, which was
+This file was extended by yast2-network $as_me 2.17.37, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-network config.status 2.17.31
+yast2-network config.status 2.17.37
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/configure.in new/yast2-network-2.17.37/configure.in
--- old/yast2-network-2.17.32/configure.in 2008-09-23 01:48:44.000000000 +0200
+++ new/yast2-network-2.17.37/configure.in 2008-10-06 14:33:29.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.17.31, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.17.37, http://bugs.opensuse.org/, yast2-network)
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.17.31"
+VERSION="2.17.37"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/clients/save_network.ycp new/yast2-network-2.17.37/src/clients/save_network.ycp
--- old/yast2-network-2.17.32/src/clients/save_network.ycp 2008-09-25 19:23:56.000000000 +0200
+++ new/yast2-network-2.17.37/src/clients/save_network.ycp 2008-10-01 15:50:25.000000000 +0200
@@ -444,7 +444,7 @@
// if portmap running - start it after reboot
WFM::Execute (.local.bash,
- "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap");
+ "pidofproc rpcbind && touch /var/lib/YaST2/network_install_rpcbind");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/lan/hardware.ycp new/yast2-network-2.17.37/src/lan/hardware.ycp
--- old/yast2-network-2.17.32/src/lan/hardware.ycp 2008-09-09 15:31:38.000000000 +0200
+++ new/yast2-network-2.17.37/src/lan/hardware.ycp 2008-10-06 14:08:58.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec
*
- * $Id: hardware.ycp 50797 2008-09-08 11:45:04Z mzugec $
+ * $Id: hardware.ycp 51863 2008-10-06 12:08:57Z mzugec $
*/
{
@@ -164,7 +164,7 @@
/* Text entry label */
`ComboBox(`id(`modul), `opt(`editable), _("&Module Name"), hardware["modules_from_hwinfo"]:[]),
`HSpacing(0.2),
- `TextEntry(`id(`options), Label::Options (), hardware["options"]:"")
+ `InputField(`id(`options), `opt(`hstretch), Label::Options (), hardware["options"]:"")
),
`VSpacing(0.4),
CheckBoxes,
@@ -202,7 +202,7 @@
// TODO: Ud ... Rules
`Frame(_("Udev rules"),
`HBox(
- `TextEntry(`id(`device_name), _("Device Name"), ""),
+ `InputField(`id(`device_name), `opt(`hstretch), _("Device Name"), ""),
`PushButton(`id(`change_udev), _("Change"))
)
);
@@ -269,7 +269,7 @@
`ReplacePoint(`id(`rp), `SelectionBox(`id(`cards), _("&Network Card"), cards)),
`VSpacing(0.5),
/* Text entry field */
- `TextEntry(`id(`search), `opt(`notify), _("&Search")),
+ `InputField(`id(`search), `opt(`hstretch, `notify), _("&Search")),
`VSpacing(0.5)
);
@@ -525,6 +525,8 @@
*/
define any S390Dialog() {
+ // already configured device (on hardware layer), skip this dialog
+ if (size(LanItems::Items[LanItems::current, "hwinfo", "dev_name"]:"")>0) return `next;
ScreenName("lan-hardware-s390");
/* S/390 dialog caption */
@@ -535,17 +537,25 @@
string helptext = "";
term contents = `Empty ();
- if(LanItems::type == "qeth") {
+
+ if(LanItems::type == "qeth" || LanItems::type == "hsi") {
+ // CHANIDS
+ list<string> tmp_list=splitstring(LanItems::qeth_chanids, " ");
+ map chanids_map = $[
+ "read" : tmp_list[0]:"",
+ "write" : tmp_list[1]:"",
+ "control" : tmp_list[2]:""
+ ];
contents = `HBox(
`HSpacing(6),
/* Frame label */
`Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox(
`VSpacing(1),
/* TextEntry label */
- `TextEntry(`id(`chan_mode), _("&Port Name"), LanItems::chan_mode),
+ `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Name"), LanItems::chan_mode),
`VSpacing(1),
/* TextEntry label */
- `TextEntry(`id(`qeth_options), Label::Options (), LanItems::qeth_options),
+ `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options),
`VSpacing(1),
/* CheckBox label */
`Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))),
@@ -553,8 +563,14 @@
/* CheckBox label */
`Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))),
/* TextEntry label */
- `TextEntry(`id(`qeth_macaddress), _("Layer2 &MAC Address"), LanItems::qeth_macaddress),
- `VSpacing(1)
+ `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress),
+ `VSpacing(1),
+// `InputField(`id(`qeth_chanids), `opt(`hstretch), _("CHAN IDS"), LanItems::qeth_chanids)
+ `HBox(
+ `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""),
+ `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:""),
+ `InputField(`id(`qeth_chan_control), `opt(`hstretch), _("Control Channel"), chanids_map["control"]:"")
+ )
), `HSpacing(2))),
`HSpacing(6)
);
@@ -567,32 +583,28 @@
_("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>");
}
+/*
if(LanItems::type == "hsi") {
contents = `HBox(
`HSpacing(6),
- /* Frame label */
`Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox(
`VSpacing(1),
- /* TextEntry label */
- `TextEntry(`id(`qeth_options), Label::Options (), LanItems::qeth_options),
+ `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options),
`VSpacing(1),
- /* CheckBox label */
`Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))),
`VSpacing(1),
- /* CheckBox label */
`Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))),
- /* TextEntry label */
- `TextEntry(`id(`qeth_macaddress), _("Layer2 &MAC Address"), LanItems::qeth_macaddress),
+ `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress),
`VSpacing(1)
), `HSpacing(2))),
`HSpacing(6)
);
- /* S/390 dialog help: QETH */
helptext = _("<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>") +
_("<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>") +
_("<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>") +
_("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>");
}
+*/
if(drvtype == "lcs") {
contents = `HBox(
@@ -601,10 +613,10 @@
`Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox(
`VSpacing(1),
/* TextEntry label */
- `TextEntry(`id(`chan_mode), _("&Port Number"), LanItems::chan_mode),
+ `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Number"), LanItems::chan_mode),
`VSpacing(1),
/* TextEntry label */
- `TextEntry(`id(`lcs_timeout), _("&LANCMD Time-Out"), LanItems::lcs_timeout)
+ `InputField(`id(`lcs_timeout), `opt(`hstretch), _("&LANCMD Time-Out"), LanItems::lcs_timeout)
), `HSpacing(2))),
`HSpacing(6)
);
@@ -625,6 +637,11 @@
];
if(drvtype == "ctc") {
+ list<string> tmp_list=splitstring(LanItems::qeth_chanids, " ");
+ map chanids_map = $[
+ "read" : tmp_list[0]:"",
+ "write" : tmp_list[1]:"",
+ ];
contents = `HBox(
`HSpacing(6),
/* Frame label */
@@ -632,7 +649,11 @@
`VSpacing(1),
/* TextEntry label */
`ComboBox(`id(`chan_mode), _("&Protocol"), ctcitems),
- `VSpacing(1)
+ `VSpacing(1),
+ `HBox(
+ `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""),
+ `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:"")
+ )
), `HSpacing(2))),
`HSpacing(6)
);
@@ -647,7 +668,7 @@
`Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox(
`VSpacing(1),
/* TextEntry label, #42789 */
- `TextEntry(`id(`chan_mode), _("&Peer Name"), ""),
+ `InputField(`id(`chan_mode), `opt(`hstretch), _("&Peer Name"), ""),
`VSpacing(1)
), `HSpacing(2))),
`HSpacing(6)
@@ -702,25 +723,14 @@
break;
}
else if(ret == `next) {
- break;
- }
- else if(ret == `qeth_layer2) {
- continue;
- }
- else {
- y2error("Unexpected return code: %1", ret);
- continue;
- }
- }
-
- if(ret == `next) {
if(LanItems::type == "iucv") {
// #176330, must be static
LanItems::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value);
LanItems::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value);
}
- else if (LanItems::type != "hsi")
- LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value);
+// if (LanItems::type != "hsi")
+ LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value);
+
if(LanItems::type == "lcs")
LanItems::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value);
if(LanItems::type == "qeth" || LanItems::type == "hsi") {
@@ -729,7 +739,25 @@
LanItems::qeth_layer2 = (boolean) UI::QueryWidget(`id(`qeth_layer2), `Value);
LanItems::qeth_macaddress = (string) UI::QueryWidget(`id(`qeth_macaddress), `Value);
}
-
+ string read = (string) UI::QueryWidget(`id(`qeth_chan_read), `Value);
+ string write = (string) UI::QueryWidget(`id(`qeth_chan_write), `Value);
+ string control = (string) UI::QueryWidget(`id(`qeth_chan_control), `Value);
+ if (control==nil) control="";
+ LanItems::qeth_chanids = String::CutBlanks( sformat("%1 %2 %3", read, write, control) );
+ if (!LanItems::createS390Device()){
+ Popup::Error(_("An error occured while creating device.\nSee YaST log for details."));
+ ret=nil;
+ continue;
+ };
+ break;
+ }
+ else if(ret == `qeth_layer2) {
+ continue;
+ }
+ else {
+ y2error("Unexpected return code: %1", ret);
+ continue;
+ }
}
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/lan/wizards.ycp new/yast2-network-2.17.37/src/lan/wizards.ycp
--- old/yast2-network-2.17.32/src/lan/wizards.ycp 2008-08-12 13:42:04.000000000 +0200
+++ new/yast2-network-2.17.37/src/lan/wizards.ycp 2008-10-02 16:11:52.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards configuration wizards
* Authors: Michal Svec
*
- * $Id: wizards.ycp 41587 2007-10-26 10:39:49Z mzugec $
+ * $Id: wizards.ycp 51843 2008-10-04 09:36:36Z mzugec $
*/
{
@@ -155,7 +155,8 @@
if(action == "add") ws_start = "hardware";
/* All S/390 network devices */
- if(Arch::s390 () && LanItems::operation == `add) {
+// if(Arch::s390 () && LanItems::operation == `add) {
+ if(Arch::s390 () ) {
ws_start = "s390";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/modules/DSL.ycp new/yast2-network-2.17.37/src/modules/DSL.ycp
--- old/yast2-network-2.17.32/src/modules/DSL.ycp 2008-08-12 13:42:03.000000000 +0200
+++ new/yast2-network-2.17.37/src/modules/DSL.ycp 2008-10-06 14:06:10.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: DSL data
* Authors: Michal Svec
*
- * $Id: DSL.ycp 46109 2008-04-04 14:02:03Z mzugec $
+ * $Id: DSL.ycp 51856 2008-10-06 11:27:23Z visnov $
*
* Representation of the configuration of DSL.
* Input and output routines.
@@ -201,7 +201,7 @@
sleep(sl);
// Confirmation: label text (detecting hardware: xxx)
- if (Confirm::Detection (_("PPPoE DSL Devices")))
+ if (Confirm::Detection (_("PPPoE DSL Devices"), "yast-dsl"))
{
// it doesn't do anything except looking whether probe.pppoe is empty
// FIXME: HW
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/modules/LanItems.ycp new/yast2-network-2.17.37/src/modules/LanItems.ycp
--- old/yast2-network-2.17.32/src/modules/LanItems.ycp 2008-09-22 13:53:59.000000000 +0200
+++ new/yast2-network-2.17.37/src/modules/LanItems.ycp 2008-10-02 16:15:43.000000000 +0200
@@ -127,6 +127,7 @@
// MAC address handling for IPv4 with the layer2 option
global boolean qeth_layer2 = false;
global string qeth_macaddress = "00:00:00:00:00:00";
+global string qeth_chanids = "";
// Timeout for LCS LANCMD
global string lcs_timeout = "5";
@@ -552,7 +553,7 @@
rich = " " + conn + "<br>" + mac_dev;
rich = HTML::Bold ( descr ) + rich;
- if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0)
+ if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0 && !Arch::s390())
rich = rich + _("<p>Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details.</p>");
else if (hasAnyValue(Items[key, "ifcfg"]:"") ) rich = rich + HTML::List (bullets);
else {
@@ -1577,8 +1578,66 @@
global boolean enableCurrentEditButton(){
if (needFirmwareCurrentItem()) return true;
+ if (Arch::s390()) return true;
if (!hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) return false;
else return true;
}
+global boolean createS390Device(){
+ y2milestone("creating device s390 network device");
+ boolean result=true;
+ // command to create device
+ string command1="";
+ // command to find created device
+ string command2="";
+ switch(type){
+ case "qeth":
+ case "hsi":
+ if (size(chan_mode)>0)
+ // chan_ids (read, write, control), port
+ command1=sformat("qeth_configure -p %1 %2 1", chan_mode, qeth_chanids);
+ else
+ command1=sformat("qeth_configure %1 1", qeth_chanids);
+ command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:"");
+ break;
+ case "ctc":
+ // chan_ids (read, write), protocol
+ command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode);
+ command2=sformat("ls /sys/devices/cu3088/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:"");
+ break;
+ case "iucv":
+ // router
+ command1=sformat("iucv_configure %1", chan_mode);
+ command2=sformat("ls /sys/devices/%1/*/net/|head -n1|tr -d '\n'", type);
+ break;
+ default:
+ y2error("Unsupported type : %1", type);
+ }
+ y2milestone("execute %1", command1);
+ map output1=(map) SCR::Execute(.target.bash_output, command1);
+ if (output1["exit"]:-1==0 && size(output1["stderr"]:"")==0) y2milestone("Success : %1", output1);
+ else{
+ y2error("Problem occured : %1", output1);
+ result=false;
+ }
+ y2milestone("output1 %1", output1);
+
+
+ if (result){
+ y2milestone("command2 %1", command2);
+ map output2=(map) SCR::Execute(.target.bash_output, command2);
+ y2milestone("output2 %1", output2);
+ if (output2["exit"]:-1==0 && size(output2["stderr"]:"")==0){
+ Items[current, "ifcfg"] = output2["stdout"]:"";
+ Items[current, "hwinfo", "dev_name"] = output2["stdout"]:"";
+ y2milestone("Device %1 created", output2["stdout"]:"");
+ }else{
+ y2error("Some problem occured : %1", output2);
+ result=false;
+ }
+ }
+
+ return result;
+}
+
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/modules/Lan.ycp new/yast2-network-2.17.37/src/modules/Lan.ycp
--- old/yast2-network-2.17.32/src/modules/Lan.ycp 2008-09-19 14:44:37.000000000 +0200
+++ new/yast2-network-2.17.37/src/modules/Lan.ycp 2008-10-02 16:11:52.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 51318 2008-09-19 12:44:36Z mzugec $
+ * $Id: Lan.ycp 51805 2008-10-02 19:21:13Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -326,7 +326,7 @@
global define boolean Write() {
y2milestone("Writing configuration");
- if(!write_only && NetHwDetection::running) NetHwDetection::Stop();
+// if(!write_only && NetHwDetection::running) NetHwDetection::Stop();
/* Stop the detection */
if(!LanItems::modified) {
@@ -403,10 +403,6 @@
if(Abort()) return false;
/* Progress step 6 */
ProgressNextStage(_("Writing hostname and DNS configuration..."));
- // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482)
- if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation.");
- else if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart");
- else NetworkService::StartStop ();
// write resolv.conf after change from dhcp to static (#327074)
// reload/restart network before this to put correct resolv.conf from dhcp-backup
DNS::Write();
@@ -438,7 +434,13 @@
/* Progress step 9 */
ProgressNextStage(_("Activating network services..."));
// NetworkModules::HwUp ();
- NetworkService::StartStop ();
+ // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482)
+ if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation.");
+ else if (LanItems::force_restart) Service::Restart("network");
+ else if(Service::Status("network")==0){
+ Service::Reload("network");
+ } else Service::Restart("network");
+// NetworkService::StartStop ();
sleep(sl);
}
@@ -464,12 +466,6 @@
sleep(sl);
}
- if(!CheckNetworkManagerPlugin()) return false;
- /* Final progress step */
- ProgressNextStage(_("Finished"));
- sleep(sl);
-
- if(Abort()) return false;
if (NetworkService::IsManaged())
{
boolean network=false;
@@ -486,6 +482,12 @@
}
if (!network) Popup::Error(_("No network running"));
}
+ if(!CheckNetworkManagerPlugin()) return false;
+ /* Final progress step */
+ ProgressNextStage(_("Finished"));
+ sleep(sl);
+
+ if(Abort()) return false;
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/src/routines/routines.ycp new/yast2-network-2.17.37/src/routines/routines.ycp
--- old/yast2-network-2.17.32/src/routines/routines.ycp 2008-09-22 14:01:01.000000000 +0200
+++ new/yast2-network-2.17.37/src/routines/routines.ycp 2008-10-06 14:06:10.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscellaneous routines
* Authors: Michal Svec
*
- * $Id: routines.ycp 50748 2008-09-05 12:35:08Z mzugec $
+ * $Id: routines.ycp 51856 2008-10-06 11:27:23Z visnov $
*/
{
@@ -601,7 +601,7 @@
/* Confirmation: label text (detecting hardware: xxx) */
string hwstring = _("All Network Devices");
if(haskey(hwstrings, hwtype)) hwstring = hwstrings[hwtype]:"";
- if(!Confirm::Detection(hwstring)) return [];
+ if(!Confirm::Detection(hwstring, "yast-lan")) return [];
/* read the corresponding hardware */
if(haskey(hwtypes, hwtype))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.32/VERSION new/yast2-network-2.17.37/VERSION
--- old/yast2-network-2.17.32/VERSION 2008-09-23 01:56:57.000000000 +0200
+++ new/yast2-network-2.17.37/VERSION 2008-10-02 17:16:30.000000000 +0200
@@ -1 +1 @@
-2.17.32
+2.17.37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org