Hello community,
here is the log from the commit of package yast2-network
checked in at Fri Nov 3 19:01:49 CET 2006.
--------
--- yast2-network/yast2-network.changes 2006-10-24 19:24:41.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-network/yast2-network.changes 2006-11-03 16:43:16.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Nov 3 16:40:44 CET 2006 - mzugec@suse.cz
+
+- UI to disable writing hostname to /etc/hosts
+- 2.14.7
+
+-------------------------------------------------------------------
+Fri Nov 3 11:18:57 CET 2006 - mzugec@suse.cz
+
+- #198417 - say "setting up smpppd, kinternet" in Write() only when really starts
+- 2.14.6
+
+-------------------------------------------------------------------
+Fri Nov 3 09:32:05 CET 2006 - kmachalkova@suse.cz
+
+- Advise user to use Add-on CD for installing some wi-fi binary
+ firmwares (#209413)
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.14.5.tar.bz2
New:
----
yast2-network-2.14.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.ToVuyb/_old 2006-11-03 19:01:41.000000000 +0100
+++ /var/tmp/diff_new_pack.ToVuyb/_new 2006-11-03 19:01:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.14.5)
+# spec file for package yast2-network (Version 2.14.7)
#
# 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-network
-Version: 2.14.5
+Version: 2.14.7
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.14.5.tar.bz2
+Source0: yast2-network-2.14.7.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -50,7 +50,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.14.5
+%setup -n yast2-network-2.14.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,6 +105,15 @@
/usr/share/YaST2/schema/autoyast/rnc/host.rnc
%changelog -n yast2-network
+* Fri Nov 03 2006 - mzugec@suse.cz
+- UI to disable writing hostname to /etc/hosts
+- 2.14.7
+* Fri Nov 03 2006 - mzugec@suse.cz
+- #198417 - say "setting up smpppd, kinternet" in Write() only when really starts
+- 2.14.6
+* Fri Nov 03 2006 - kmachalkova@suse.cz
+- Advise user to use Add-on CD for installing some wi-fi binary
+ firmwares (#209413)
* Tue Oct 24 2006 - mzugec@suse.cz
- #300604 - UI to disable IPv6 (installation)
- 2.14.5
++++++ yast2-network-2.14.5.tar.bz2 -> yast2-network-2.14.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/VERSION new/yast2-network-2.14.7/VERSION
--- old/yast2-network-2.14.5/VERSION 2006-10-24 19:17:13.000000000 +0200
+++ new/yast2-network-2.14.7/VERSION 2006-11-03 16:40:40.000000000 +0100
@@ -1 +1 @@
-2.14.5
+2.14.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/configure new/yast2-network-2.14.7/configure
--- old/yast2-network-2.14.5/configure 2006-10-24 18:58:11.000000000 +0200
+++ new/yast2-network-2.14.7/configure 2006-11-03 16:28:11.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-network 2.14.4.
+# Generated by GNU Autoconf 2.59 for yast2-network 2.14.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.14.4'
-PACKAGE_STRING='yast2-network 2.14.4'
+PACKAGE_VERSION='2.14.6'
+PACKAGE_STRING='yast2-network 2.14.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
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-network 2.14.4 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.14.6 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-network 2.14.4:";;
+ short | recursive ) echo "Configuration of yast2-network 2.14.6:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.14.4
+yast2-network configure 2.14.6
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-network $as_me 2.14.4, which was
+It was created by yast2-network $as_me 2.14.6, 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-network'
- VERSION='2.14.4'
+ VERSION='2.14.6'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.4"
+VERSION="2.14.6"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-network $as_me 2.14.4, which was
+This file was extended by yast2-network $as_me 2.14.6, 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-network config.status 2.14.4
+yast2-network config.status 2.14.6
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-network-2.14.5/configure.in new/yast2-network-2.14.7/configure.in
--- old/yast2-network-2.14.5/configure.in 2006-10-24 18:58:04.000000000 +0200
+++ new/yast2-network-2.14.7/configure.in 2006-11-03 16:28:04.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.14.4, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.14.6, 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.14.4"
+VERSION="2.14.6"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/src/lan/complex.ycp new/yast2-network-2.14.7/src/lan/complex.ycp
--- old/yast2-network-2.14.5/src/lan/complex.ycp 2006-10-23 10:33:23.000000000 +0200
+++ new/yast2-network-2.14.7/src/lan/complex.ycp 2006-11-03 09:36:41.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 33562 2006-10-23 08:33:20Z mzugec $
+ * $Id: complex.ycp 33999 2006-11-03 08:36:36Z kmachalkova $
*/
{
@@ -27,6 +27,10 @@
import "Popup";
import "Label";
+import "Product";
+import "Pkg";
+import "Package";
+
include "network/routines.ycp";
include "network/summary.ycp";
@@ -287,6 +291,8 @@
* @return whether to proceed with editing and commiting the config
*/
define boolean AddInterface (integer hwid) {
+ list <string> firmwares = ["ipw-firmware", "atmel-firmware", "qlogic-firmware"];
+
Lan::Add ();
Lan::SelectHW (hwid);
Lan::SetDefaultsForHW ();
@@ -307,6 +313,24 @@
// - wlan firmware: here, just because it is copied from modems
// #45960
if(Lan::Requires != [] && Lan::Requires != nil) {
+ boolean found = false;
+ foreach(string fw, firmwares, {
+ if(contains(Lan::Requires, fw)){
+ //check if package with the firmware is available
+ //i.e. if there are any inst. sources defined
+ //and if the package is available on any of them
+ if ((Pkg::SourceGetCurrent(true) == []) || !Package::Available(fw)){
+ Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from
+%1 Add-On CD.\nTo install the firmware, add Add-On CD to your YaST installation sources and return
+to this configuration dialog."), Product::name));
+ found = true;
+ break;
+ };
+ }
+ });
+ if (found)
+ return false;
+
if(PackagesInstall(Lan::Requires) != `next)
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/src/modules/DNS.ycp new/yast2-network-2.14.7/src/modules/DNS.ycp
--- old/yast2-network-2.14.5/src/modules/DNS.ycp 2006-10-20 15:04:14.000000000 +0200
+++ new/yast2-network-2.14.7/src/modules/DNS.ycp 2006-11-03 16:41:34.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS data
* Authors: Michal Svec
*
- * $Id: DNS.ycp 28756 2006-03-09 12:36:38Z mvidner $
+ * $Id: DNS.ycp 34031 2006-11-03 15:41:31Z mzugec $
*
* Manages resolv.conf and (fully qualified) hostname, also
* respecting DHCP.
@@ -218,6 +218,7 @@
list<string> ips = maplist(string dev, devs, {
return NetworkDevices::GetValue(dev, "IPADDR");
});
+ if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) Host::write_hostname=false;
Host::Update(oldhostname, fqhostname, ips);
Host::Write();
oldhostname = fqhostname; // #49634
@@ -340,6 +341,8 @@
else if(size(hostname) > 0)
/* Summary text */
summary = Summary::AddListItem(summary, sformat(_("Hostname: %1"), Hostname::MergeFQ(hostname, domain)));
+ if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false)
+ summary = Summary::AddListItem(summary, _("Hostname will not be written to /etc/hosts"));
if (has_dhcp && NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false) {
/* Summary text */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/src/modules/Host.ycp new/yast2-network-2.14.7/src/modules/Host.ycp
--- old/yast2-network-2.14.5/src/modules/Host.ycp 2006-10-20 15:04:14.000000000 +0200
+++ new/yast2-network-2.14.7/src/modules/Host.ycp 2006-11-03 16:41:34.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hosts data (/etc/hosts)
* Authors: Michal Svec
*
- * $Id: Host.ycp 33495 2006-10-18 13:01:31Z kmachalkova $
+ * $Id: Host.ycp 34031 2006-11-03 15:41:31Z mzugec $
*/
{
@@ -29,6 +29,8 @@
*/
global boolean modified = false;
+global boolean write_hostname = true;
+
/**
* All hosts read at the start
*/
@@ -232,13 +234,14 @@
/* Add at least one hostname/ip */
// but do not overload localhost (#46715)
- if (size(ips) < 1 && nick != "localhost") {
- y2milestone("No IP found, adding dummy 127.0.0.2");
- // TODO #42102
- hosts["127.0.0.2"] = [ newhn + " " + nick ];
- y2milestone("Hosts: %1", hosts);
- return true;
- }
+ if (write_hostname)
+ if (size(ips) < 1 && nick != "localhost") {
+ y2milestone("No IP found, adding dummy 127.0.0.2");
+ // TODO #42102
+ hosts["127.0.0.2"] = [ newhn + " " + nick ];
+ y2milestone("Hosts: %1", hosts);
+ return true;
+ }
/* Add hostname/ip for all ips */
boolean nickadded = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/src/modules/Lan.ycp new/yast2-network-2.14.7/src/modules/Lan.ycp
--- old/yast2-network-2.14.5/src/modules/Lan.ycp 2006-10-23 10:33:23.000000000 +0200
+++ new/yast2-network-2.14.7/src/modules/Lan.ycp 2006-11-03 11:22:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec
*
- * $Id: Lan.ycp 33562 2006-10-23 08:33:20Z mzugec $
+ * $Id: Lan.ycp 34009 2006-11-03 10:22:34Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -404,12 +404,11 @@
/* Write dialog caption */
string caption = _("Saving Network Configuration");
- integer steps = 11;
integer sl = 0; /* 1000; /* TESTING */
sleep(sl);
- Progress::New(caption, " ", steps, [
+ list<string> step_labels = [
/* Progress stage 2 */
_("Write drivers information"),
/* Progress stage 3 - multiple devices may be present,really plural*/
@@ -423,16 +422,22 @@
/* Progress stage 7 */
_("Set up network services"),
/* Progress stage 8 */
- _("Write firewall settings"),
- /* Progress stage 9 */
- _("Activate network services"),
+ _("Write firewall settings")
+ ];
+ /* Progress stage 9 */
+ if (!write_only) step_labels = add(step_labels, _("Activate network services"));
/* Progress stage 10 */
- _("Run SuSEconfig"),
- /* Progress stage 11 */
- _("Set up smpppd"),
- /* Progress stage 12 */
- _("Run KInternet"),
- ], [], "");
+ step_labels=add(step_labels, _("Run SuSEconfig"));
+ if (!NetworkService::IsManaged() && (boolean) SCR::Read(.init.scripts.exists, "smpppd") && !write_only && needKInternet())
+ {
+ /* Progress stage 11 */
+ step_labels=add(step_labels, _("Set up smpppd"));
+ /* Progress stage 12 */
+ step_labels = add(step_labels, _("Run KInternet"));
+ }
+
+ Progress::New(caption, " ", size(step_labels), step_labels, [], "");
+
if(Abort()) return false;
/* Progress step 2 */
@@ -482,14 +487,14 @@
Progress::set (orig);
sleep(sl);
- if(Abort()) return false;
- /* Progress step 9 */
- ProgressNextStage(_("Activating network services..."));
if(!write_only) {
+ if(Abort()) return false;
+ /* Progress step 9 */
+ ProgressNextStage(_("Activating network services..."));
NetworkModules::HwUp ();
NetworkService::StartStop ();
- }
sleep(sl);
+ }
if(Abort()) return false;
/* Progress step 10 */
@@ -497,21 +502,21 @@
if(!write_only) RunSuSEconfig();
sleep(sl);
- if(Abort()) return false;
- /* Progress step 11 */
- ProgressNextStage(_("Setting up smpppd(8)..."));
- // takes care of autoinst by itself
- SetupSMPPPD();
- sleep(sl);
-
- if(Abort()) return false;
- /* Progress step 12 */
- ProgressNextStage(_("Running KInternet..."));
- if (!write_only)
- {
- RunKInternet();
- }
- sleep(sl);
+ if (!NetworkService::IsManaged() && (boolean) SCR::Read(.init.scripts.exists, "smpppd") && !write_only && needKInternet())
+ {
+ if(Abort()) return false;
+ /* Progress step 11 */
+ ProgressNextStage(_("Setting up smpppd(8)..."));
+ // takes care of autoinst by itself
+ SetupSMPPPD();
+ sleep(sl);
+
+ if(Abort()) return false;
+ /* Progress step 12 */
+ ProgressNextStage(_("Running KInternet..."));
+ RunKInternet();
+ sleep(sl);
+ }
if(Abort()) return false;
/* Final progress step */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/src/routines/runtime.ycp new/yast2-network-2.14.7/src/routines/runtime.ycp
--- old/yast2-network-2.14.5/src/routines/runtime.ycp 2006-10-20 15:04:14.000000000 +0200
+++ new/yast2-network-2.14.7/src/routines/runtime.ycp 2006-11-03 11:22:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Runtime routines
* Authors: Michal Svec
*
- * $Id: runtime.ycp 33495 2006-10-18 13:01:31Z kmachalkova $
+ * $Id: runtime.ycp 34009 2006-11-03 10:22:34Z mzugec $
*/
{
@@ -143,25 +143,32 @@
y2debug("ret=%1", ret);
return ret;
}
+/**
+ * Do we need to start KInternet?
+ */
+define boolean needKInternet(){
+ /* Any dialup devices? */
+ if (!HaveDialupLikeInterfaces ())
+ {
+ y2milestone ("No dialup-like interfaces");
+ return false;
+ }
+
+ /* Installation? */
+ if(!Mode::normal ()) {
+ y2milestone("No normal mode");
+ return false;
+ }
+ return true;
+}
+
/**
* Run KInternet
* @return true if success
*/
define boolean RunKInternet() {
- /* Any dialup devices? */
- if (!HaveDialupLikeInterfaces ())
- {
- y2milestone ("No dialup-like interfaces");
- return true;
- }
-
- /* Installation? */
- if(!Mode::normal ()) {
- y2milestone("No normal mode");
- return true;
- }
-
+ if (!needKInternet()) return true;
/* Text mode? */
map ui = UI::GetDisplayInfo();
boolean ncurses = (boolean) ui["TextMode"]:nil;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.5/src/services/dns.ycp new/yast2-network-2.14.7/src/services/dns.ycp
--- old/yast2-network-2.14.5/src/services/dns.ycp 2006-10-20 15:04:12.000000000 +0200
+++ new/yast2-network-2.14.7/src/services/dns.ycp 2006-11-03 16:41:34.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Michal Svec
* Martin Vidner
*
- * $Id: dns.ycp 33494 2006-10-18 12:17:01Z kmachalkova $
+ * $Id: dns.ycp 34031 2006-11-03 15:41:31Z mzugec $
*/
{
@@ -60,10 +60,19 @@
* @return initial settings for this dialog in one map, from DNS::
*/
define map InitSettings () {
+ boolean write_hostname = true;
+
+ // this is only until WRITE_HOSTNAME_TO_HOSTS is not written in sysconfig
+ if (tostring(NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:nil)=="yes" || tostring(NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:nil)=="no")
+ write_hostname = (tostring(NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:"yes")=="yes")?true:false;
+
+ else write_hostname = NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true;
map settings = $[
"HOSTNAME": DNS::hostname,
"DOMAIN": DNS::domain,
"DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false,
+ // set as true by default because there wasn't this option in previous version
+ "WRITE_HOSTNAME": write_hostname,
"DHCP_RESOLV": NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false,
];
// the rest is not so straightforward,
@@ -101,6 +110,7 @@
DNS::nameservers = NonEmpty (nameservers);
DNS::searchlist = NonEmpty (searchlist);
NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = settings["DHCP_HOSTNAME"]:false;
+ NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = settings["WRITE_HOSTNAME"]:true;
NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"] = settings["DHCP_RESOLV"]:false;
/* update modified flag */
DNS::modified = true;
@@ -128,7 +138,7 @@
}
/**
- * Event handler for DHCP_HOSTNAME checkbox.
+ * Event handler for DHCP_HOSTNAME and WRITE_HOSTNAME checkbox.
* enable or disable: is DHCP available?
* @param key the widget receiving the event
* @param event the event being handled
@@ -307,6 +317,21 @@
"handle": HandleDhcpHostname,
],
+ "WRITE_HOSTNAME": $[
+ "widget": `checkbox,
+ /* checkbox label */
+ "label": _("&Write Hostname to /etc/hosts"),
+ "opt": [],
+ // help
+ "help": _("<p>If you are using DHCP to get an IP address, your hostname will be written
+to /etc/hosts and be resolvable as 127.0.0.2 IP address.
+This is default behavior. If you want to disable this, uncheck this box
+but your hostname will not be resolvable without active network.
+</p>
+"),
+ //use the same handler - it enables checkbox if dhcp is used
+ "handle": HandleDhcpHostname,
+ ],
"NAMESERVER_1": $[
"widget": `textentry,
/* textentry label */
@@ -384,7 +409,8 @@
`HSpacing (1),
"DOMAIN"
),
- `Left ("DHCP_HOSTNAME")
+ `Left ("DHCP_HOSTNAME"),
+ `Left ("WRITE_HOSTNAME")
))
);
@@ -494,7 +520,8 @@
"DOMAIN"
),
/* CheckBox label */
- `Left("DHCP_HOSTNAME")
+ `Left("DHCP_HOSTNAME"),
+ `Left("WRITE_HOSTNAME")
)),
`VSpacing(1),
/* Frame label */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org