Hello community,
here is the log from the commit of package yast2-network
checked in at Sat Aug 25 00:15:23 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-08-21 10:57:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-08-24 16:55:10.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Aug 24 16:55:51 CEST 2007 - mzugec@suse.cz
+
+- use "netcard" macro from NetworkDevices (#303847)
+- 2.15.67
+
+-------------------------------------------------------------------
+Fri Aug 24 16:42:17 CEST 2007 - mzugec@suse.cz
+
+- write extra drivers into 79-yast2-drivers.rules (#300892)
+- handle renamed udev rule for network devices (#302544)
+- 2.15.66
+
+-------------------------------------------------------------------
+Fri Aug 24 14:40:53 CEST 2007 - kmachalkova@suse.cz
+
+- Adjusted layout of several dialogs to fit 80x25 screen
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.65.tar.bz2
New:
----
yast2-network-2.15.67.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.F13808/_old 2007-08-25 00:14:42.000000000 +0200
+++ /var/tmp/diff_new_pack.F13808/_new 2007-08-25 00:14:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.65)
+# spec file for package yast2-network (Version 2.15.67)
#
# 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-network
-Version: 2.15.65
+Version: 2.15.67
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.65.tar.bz2
+Source0: yast2-network-2.15.67.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -43,12 +43,12 @@
Conflicts: yast2-core < 2.10.6
Summary: YaST2 - Network Configuration
%package devel-doc
-Version: 2.15.65
+Version: 2.15.67
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.65.tar.bz2
+Source0: yast2-network-2.15.67.tar.bz2
prefix: /usr
Requires: yast2-network >= 2.15.53
Summary: YaST2 - Developer documentation for yast2-network
@@ -73,7 +73,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.15.65
+%setup -n yast2-network-2.15.67
%build
%{prefix}/bin/y2tool y2autoconf
@@ -141,6 +141,15 @@
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Fri Aug 24 2007 - mzugec@suse.cz
+- use "netcard" macro from NetworkDevices (#303847)
+- 2.15.67
+* Fri Aug 24 2007 - mzugec@suse.cz
+- write extra drivers into 79-yast2-drivers.rules (#300892)
+- handle renamed udev rule for network devices (#302544)
+- 2.15.66
+* Fri Aug 24 2007 - kmachalkova@suse.cz
+- Adjusted layout of several dialogs to fit 80x25 screen
* Tue Aug 21 2007 - mzugec@suse.cz
- correctly write wlan configuration (#297616)
- 2.15.65
++++++ yast2-network-2.15.65.tar.bz2 -> yast2-network-2.15.67.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/agents/ag_udev_persistent new/yast2-network-2.15.67/agents/ag_udev_persistent
--- old/yast2-network-2.15.65/agents/ag_udev_persistent 2007-08-16 16:13:14.000000000 +0200
+++ new/yast2-network-2.15.67/agents/ag_udev_persistent 2007-08-24 15:53:16.000000000 +0200
@@ -9,28 +9,28 @@
use strict;
-my $filename = "/etc/udev/rules.d/70-persistent-net.rules";
-my @comment = ();
+my $net_file = "/etc/udev/rules.d/70-persistent-net.rules";
+my $drivers_file = "/etc/udev/rules.d/79-yast2-drivers.rules";
+my @net_comment = ();
+my @drivers_comment = ();
-sub parse_rules {
+sub parse_net_rules {
my $class = shift;
my %hash_table = ();
- # you don't need it read twice
-# return 1 if (keys(%hash_table));
- if( open( FILE, "< $filename" ) ) {
+ if( open( FILE, "< $net_file" ) ) {
while( my $line = <FILE> ) {
# remove '\n' and space before delimiter ','
chomp($line);
$line =~ s/, /,/g;
- if ( $line =~ /^#/ ) { push(@comment, $line); }
+ if ( $line =~ /^#/ ) { push(@net_comment, $line); }
else {
if ($line =~ /,/ )
{
my @cols = split(",", $line);
- my (undef, $device) = split("=", $cols[3]);
+ my (undef, $device) = split("=", $cols[$#cols]);
$device =~ s/\"//g;
$hash_table{ $device } = \@cols;
}
@@ -38,13 +38,70 @@
}
close(FILE);
} else {
- return $class->SetError(summary => sprintf( _("opening %s failed: %s"),$filename, $!),
+ return $class->SetError(summary => sprintf( _("opening %s failed: %s"),$net_file, $!),
code => "OPEN_FAILED");
}
return \%hash_table;
}
+sub parse_drivers_rules {
+ my $class = shift;
+ my %hash_table = ();
+
+ if( open( FILE, "< $drivers_file" ) ) {
+ while( my $line = <FILE> ) {
+
+ # remove '\n' and space before delimiter ','
+ chomp($line);
+ $line =~ s/, /,/g;
+
+ if ( $line =~ /^#/ ) { push(@drivers_comment, $line); }
+ else {
+ if ($line =~ /,/ )
+ {
+ my @cols = split(",", $line);
+ my (undef, $device) = split("==", $cols[0]);
+ $device =~ s/\"//g;
+ $hash_table{ $device } = \@cols;
+ }
+ }
+ }
+ close(FILE);
+ } else {
+ return $class->SetError(summary => sprintf( _("opening %s failed: %s"),$drivers_file, $!),
+ code => "OPEN_FAILED");
+ }
+
+ return \%hash_table;
+}
+
+sub write_drivers_rules(){
+ my $class = shift;
+ my $param = \@_;
+ my %hash = %{$$param[0]};
+
+ my @output = ();
+ foreach my $row (@drivers_comment){
+ push (@output, $row."\n");
+ }
+ foreach my $key (keys %hash){
+ my $row = join(', ', @{$hash{$key}});
+ push(@output, $row."\n");
+
+ }
+
+
+ if( open( FILE, "> $drivers_file" ) ) {
+ print FILE @output;
+ } else {
+ return $class->SetError(summary => sprintf( _("saving %s failed: %s"),$drivers_file, $!),
+ code => "OPEN_FAILED");
+ }
+}
+
+
+
sub Execute {
my $class = shift;
my ($path, @args) = @_;
@@ -56,11 +113,21 @@
sub Read {
my $class = shift;
my ($path, @args) = @_;
-
- return $class->parse_rules();
+ if ($path eq '.net'){
+ return $class->parse_net_rules();
+ }
+ elsif ($path eq '.drivers'){
+ return $class->parse_drivers_rules();
+ }
}
sub Write {
+ my $class = shift;
+ my ($path, @args) = @_;
+ if ($path eq '.drivers'){
+ my $hash_pointer = $args[0];
+ return $class->write_drivers_rules($hash_pointer);
+ }
}
sub Dir {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/configure new/yast2-network-2.15.67/configure
--- old/yast2-network-2.15.65/configure 2007-08-21 10:51:03.000000000 +0200
+++ new/yast2-network-2.15.67/configure 2007-08-24 16:51:32.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-network 2.15.64.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.15.66.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.15.64'
-PACKAGE_STRING='yast2-network 2.15.64'
+PACKAGE_VERSION='2.15.66'
+PACKAGE_STRING='yast2-network 2.15.66'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.15.64 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.15.66 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.15.64:";;
+ short | recursive ) echo "Configuration of yast2-network 2.15.66:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.15.64
+yast2-network configure 2.15.66
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.15.64, which was
+It was created by yast2-network $as_me 2.15.66, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.15.64'
+ VERSION='2.15.66'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.15.64"
+VERSION="2.15.66"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -3303,7 +3303,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.15.64, which was
+This file was extended by yast2-network $as_me 2.15.66, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.15.64
+yast2-network config.status 2.15.66
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/configure.in new/yast2-network-2.15.67/configure.in
--- old/yast2-network-2.15.65/configure.in 2007-08-21 10:50:59.000000000 +0200
+++ new/yast2-network-2.15.67/configure.in 2007-08-24 16:51:26.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.64, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.66, http://bugs.opensuse.org/, yast2-network)
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.15.64"
+VERSION="2.15.66"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/src/lan/complex.ycp new/yast2-network-2.15.67/src/lan/complex.ycp
--- old/yast2-network-2.15.65/src/lan/complex.ycp 2007-08-21 10:57:17.000000000 +0200
+++ new/yast2-network-2.15.67/src/lan/complex.ycp 2007-08-24 16:37:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 40375 2007-08-21 08:56:44Z mzugec $
+ * $Id: complex.ycp 40455 2007-08-24 12:42:28Z kmachalkova $
*/
{
@@ -385,9 +385,9 @@
"global" : $[
"header" : _("Global Options"),
"contents" : `VBox (
- `MarginBox(1, 0.5, "MANAGED"),
- `MarginBox(1, 0.5, "IPV6"),
- `MarginBox(1, 0.5, "DHCLIENT_OPTIONS"),
+ `MarginBox(1, 0.49, "MANAGED"),
+ `MarginBox(1, 0.49, "IPV6"),
+ `MarginBox(1, 0.49, "DHCLIENT_OPTIONS"),
`VStretch()
),
"widget_names" : ["MANAGED", "IPV6", "DHCLIENT_OPTIONS"]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/src/lan/hardware.ycp new/yast2-network-2.15.67/src/lan/hardware.ycp
--- old/yast2-network-2.15.65/src/lan/hardware.ycp 2007-08-21 10:57:17.000000000 +0200
+++ new/yast2-network-2.15.67/src/lan/hardware.ycp 2007-08-24 16:43:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec
*
- * $Id: hardware.ycp 40375 2007-08-21 08:56:44Z mzugec $
+ * $Id: hardware.ycp 40477 2007-08-24 14:37:45Z mzugec $
*/
{
@@ -81,7 +81,11 @@
hardware["realtype"] = NetworkDevices::RealType(hardware["type"]:"", hardware["hotplug"]:"");
if (hasAnyValue(NetworkDevices::Name)) hardware["device"] = NetworkDevices::device_num(NetworkDevices::Name);
else hardware["device"] = LanItems::device;
- hardware["default_device"] = LanItems::device;
+ string driver = LanItems::getCurrentItem()["udev", "driver"]:"";
+
+
+ hardware["default_device"] = hasAnyValue(driver) ? driver : LanItems::getCurrentItem()["hwinfo", "module"]:"" ;
+
// #38213, remember device id when we switch back from pcmcia/usb
hardware["non_hotplug_device_id"] = hardware["device"]:"";
/*
@@ -225,7 +229,7 @@
);
UI::ReplaceWidget(`hw_content, contents);
-
+ UI::ChangeWidget(`modul, `Value, hardware["default_device"]:"");
UI::ChangeWidget(`id(`modul), `Enabled, hardware["no_hotplug_dummy"]:false);
// UI::ChangeWidget(`id(`options), `Enabled, hardware["no_hotplug_dummy"]:false);
ChangeWidgetIfExists(`id(`list), `Enabled, hardware["no_hotplug_dummy"]:false);
@@ -386,8 +390,8 @@
}
if(hardware["hotplug"]:"" == "usb") hardware["device"] = "bus-usb";
- else if(hardware["hotplug"]:"" == "pcmcia") hardware["device"] = "bus-pcmcia";
- else hardware["device"] = hardware["non_hotplug_device_id"]:"";
+ else if(hardware["hotplug"]:"" == "pcmcia") hardware["device"] = "bus-pcmcia";
+ else hardware["device"] = hardware["non_hotplug_device_id"]:"";
UI::ChangeWidget(`id(`num), `Value, hardware["device"]:"");
@@ -445,6 +449,10 @@
NetworkDevices::Name = name;
LanItems::Items[LanItems::current]= $["ifcfg":name];
}
+
+ LanItems::setDriver((string) UI::QueryWidget(`modul, `Value));
+
+
/*
if(!(boolean)UI::QueryWidget(`enable_hwcfg, `Value))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/src/modules/LanItems.ycp new/yast2-network-2.15.67/src/modules/LanItems.ycp
--- old/yast2-network-2.15.65/src/modules/LanItems.ycp 2007-08-21 09:31:01.000000000 +0200
+++ new/yast2-network-2.15.67/src/modules/LanItems.ycp 2007-08-24 16:49:52.000000000 +0200
@@ -16,7 +16,7 @@
*/
global map Items = $[];
global list<map> Hardware = [];
-global map udev_rules = $[];
+global map udev_net_rules = $[];
global string interfacename="";
@@ -134,14 +134,21 @@
include "network/hardware.ycp";
-map ReadUdevRules(){
- udev_rules = (map)SCR::Read(.udev_persistent);
-y2internal("read udev : %1", udev_rules);
- return udev_rules;
+boolean ReadUdevRules(){
+ y2milestone ("Reading udev rules ...");
+ udev_net_rules = (map)SCR::Read(.udev_persistent.net);
+ return true;
}
-void WriteUdevRules(){
- SCR::Write(.udev_persistent, udev_rules);
+global void WriteUdevRules(){
+// SCR::Write(.udev_persistent.net, udev_net_rules);
+ map udev_drivers_rules = $[];
+ foreach(integer key, (list<integer>)Map::Keys(Items), {
+ if (hasAnyValue(Items[key, "udev", "driver"]:""))
+ udev_drivers_rules[Items[key, "udev", "driver"]:""] = [ sformat("ENV{MODALIAS}==\"%1\"", Items[key, "hwinfo", "modalias"]:""), sformat("ENV{MODALIAS}=\"%1\"", Items[key, "udev", "driver"]:"") ];
+ });
+y2internal("%1", udev_drivers_rules);
+ SCR::Write(.udev_persistent.drivers, udev_drivers_rules);
}
/**
@@ -199,9 +206,12 @@
global void ReadHw(){
Hardware = ReadHardware("netcard");
ReadUdevRules();
+
+ map udev_drivers_rules = (map)SCR::Read(.udev_persistent.drivers);
foreach(map hwitem, Hardware, {
- list udev = (hwitem["dev_name"]:"" != "") ? udev_rules[hwitem["dev_name"]:""]:[] : [];
- Items[size(Items)] = $["hwinfo":hwitem, "udev":udev];
+ list udev_net = (hwitem["dev_name"]:"" != "") ? udev_net_rules[hwitem["dev_name"]:""]:[] : [];
+ string mod = deletechars(splitstring((udev_drivers_rules[hwitem["modalias"]:""]:[])[1]:"", "=")[1]:"", "\"");
+ Items[size(Items)] = $["hwinfo":hwitem, "udev":$["net":udev_net, "driver":mod]];
});
}
@@ -215,7 +225,7 @@
// match configurations to Items list with hwinfo
map configurations = NetworkDevices::FilterDevices("netcard");
- foreach(string devtype, ["eth", "wlan"], {
+ foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), {
foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
string confname = NetworkDevices::device_name(devtype, devnum);
@@ -237,7 +247,7 @@
// add to Items also virtual devices (configurations) without hwinfo
- foreach(string devtype, ["eth", "wlan"], {
+ foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), {
foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
// foreach(string dev_name, map tmp_map, NetworkDevices::FilterDevices("netcard"), {
@@ -711,18 +721,13 @@
];
global list<string> GetItemUdev(){
-// column: 0 mens rule, 1 means device
+// column: 0 mens rule, 1 means NAME
list<string> udevs=["", ""];
- if (size(Items[current, "udev"]:[])>3)
+ if (size(Items[current, "udev", "net"]:[])>3)
{
- udevs[0]=Items[current, "udev", 2]:"";
-/*
- if (regexpmatch (Items[current, "udev", 3]:"", ".* [^ ]*\"$")) {
- udevs[1]=regexpsub (Items[current, "udev", 3]:"", ".* ([^ ]*)\"$", "\\1");
- }
-*/
- if (regexpmatch (Items[current, "udev", 3]:"", ".*=[^ ]*\"$"))
- udevs[1]=regexpsub (Items[current, "udev", 3]:"", ".*=[\"]*([^ ]*)\"$", "\\1");
+ udevs[0]=Items[current, "udev", "net", 2]:"";
+ if (regexpmatch (Items[current, "udev", "net", 3]:"", ".*=[^ ]*\"$"))
+ udevs[1]=regexpsub (Items[current, "udev", "net", 3]:"", ".*=[\"]*([^ ]*)\"$", "\\1");
}
return udevs;
}
@@ -1341,4 +1346,11 @@
return true;
}
+global void setDriver(string driver){
+y2internal("driver %1, %2", driver, getCurrentItem()["hwinfo", "module"]:"");
+ if (getCurrentItem()["hwinfo", "module"]:""==driver && !hasAnyValue(getCurrentItem()["udev", "driver"]:"")) return;
+ Items[current, "udev", "driver"] = driver;
+}
+
+
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/src/modules/Lan.ycp new/yast2-network-2.15.67/src/modules/Lan.ycp
--- old/yast2-network-2.15.65/src/modules/Lan.ycp 2007-08-16 16:13:15.000000000 +0200
+++ new/yast2-network-2.15.67/src/modules/Lan.ycp 2007-08-24 16:43:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 40271 2007-08-14 21:21:48Z mzugec $
+ * $Id: Lan.ycp 40477 2007-08-24 14:37:45Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -366,6 +366,7 @@
if(Abort()) return false;
/* Progress step 3 - multiple devices may be present, really plural*/
ProgressNextStage(_("Writing device configuration..."));
+ LanItems::WriteUdevRules();
NetworkDevices::Write("netcard");
// WriteDevices();
sleep(sl);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/src/routines/complex.ycp new/yast2-network-2.15.67/src/routines/complex.ycp
--- old/yast2-network-2.15.65/src/routines/complex.ycp 2007-08-18 09:02:27.000000000 +0200
+++ new/yast2-network-2.15.67/src/routines/complex.ycp 2007-08-24 16:43:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec
*
- * $Id: complex.ycp 40339 2007-08-17 13:47:03Z mzugec $
+ * $Id: complex.ycp 40477 2007-08-24 14:37:45Z mzugec $
*
*/
@@ -36,7 +36,6 @@
*/
define string BuildDescription (string devtype, string devnum, map devmap,
list<map> Hardware) {
-y2internal("devmap %1", devmap);
string descr = devmap["NAME"]:"";
if (descr != "") return descr;
descr = HardwareName (Hardware, devnum);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/src/routines/routines.ycp new/yast2-network-2.15.67/src/routines/routines.ycp
--- old/yast2-network-2.15.65/src/routines/routines.ycp 2007-08-16 16:13:15.000000000 +0200
+++ new/yast2-network-2.15.67/src/routines/routines.ycp 2007-08-24 16:43:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscellaneous routines
* Authors: Michal Svec
*
- * $Id: routines.ycp 40026 2007-08-06 15:37:14Z mzugec $
+ * $Id: routines.ycp 40477 2007-08-24 14:37:45Z mzugec $
*/
{
@@ -626,6 +626,7 @@
one["sysfs_id"] = card["sysfs_id"]:"";
one["dev_name"] = card["dev_name"]:"";
one["requires"] = card["requires"]:[];
+ one["modalias"] = card["modalias"]:"";
// Each card remembers its position in the list of _all_ cards.
// It is used when selecting the card from the list of _unconfigured_
// ones (which may be smaller). #102945.
@@ -696,7 +697,7 @@
y2milestone ("No good drivers found");
// #153235
// fail, unless we are in xen (it has the driver built in)
- card_ok = Arch::is_xenU ();
+// card_ok = Arch::is_xenU ();
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/src/services/dns.ycp new/yast2-network-2.15.67/src/services/dns.ycp
--- old/yast2-network-2.15.65/src/services/dns.ycp 2007-08-16 16:13:15.000000000 +0200
+++ new/yast2-network-2.15.67/src/services/dns.ycp 2007-08-24 16:37:35.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec
* Martin Vidner
*
- * $Id: dns.ycp 37726 2007-04-26 08:27:08Z mzugec $
+ * $Id: dns.ycp 40455 2007-08-24 12:42:28Z kmachalkova $
*/
{
@@ -363,7 +363,7 @@
],
"MODIFY_RESOLV" : $[
"widget": `checkbox,
- "label" : _("&Change /etc/resolv.conf modified by another process"),
+ "label" : _("&Change /etc/resolv.conf manually"),
"opt" : [`notify],
"init" : initModifyResolv,
"handle": handleModifyResolv,
@@ -398,7 +398,7 @@
"DHCP_RESOLV": $[
"widget": `custom,
"custom_widget" : `HBox(
- `CheckBox(`id("DHCP_RESOLV"), `opt(`notify), _("&Update Name Servers and\nSearch List via DHCP")),
+ `CheckBox(`id("DHCP_RESOLV"), `opt(`notify), _("&Update DNS data via DHCP")),
`ReplacePoint( `id("dh_resolv_text"), `Empty() )
),
// help
@@ -429,7 +429,7 @@
`Left("DHCP_HOSTNAME"),
`Left("WRITE_HOSTNAME")
)),
- `VSpacing(1),
+ `VSpacing(0.49),
`Left("MODIFY_RESOLV"),
/* Frame label */
`Frame(_("Name Servers and Domain Search List"), `VBox(
@@ -442,6 +442,7 @@
`HSpacing (1),
`HWeight (1, "SEARCHLIST_S")
)),
+ `VSpacing(0.49),
/* CheckBox label */
`Left ("DHCP_RESOLV")
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.65/VERSION new/yast2-network-2.15.67/VERSION
--- old/yast2-network-2.15.65/VERSION 2007-08-21 10:53:38.000000000 +0200
+++ new/yast2-network-2.15.67/VERSION 2007-08-24 16:55:49.000000000 +0200
@@ -1 +1 @@
-2.15.65
+2.15.67
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org