Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory
checked in at Tue Mar 16 12:09:34 CET 2010.
--------
--- sysconfig/sysconfig.changes 2010-02-17 18:37:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2010-03-12 19:01:16.000000000 +0100
@@ -1,0 +2,57 @@
+Fri Mar 12 16:14:13 UTC 2010 - mt@suse.de
+
+- version 0.73.4
+- Removed the haldaemon Required-Start/Stop dependency from the
+ /etc/init.d/network-remotefs script, NetworkManager dropped it.
+- Added reading of a temporary startmode in ifdown to skip
+ stopping of the interface and avoid shutdown problems when
+ multipathed iscsi device was mounted (bnc#581259).
+- Do not use own ipoib mode/umcast defaults in ifup-infiniband
+ but honor the /etc/sysconfig/infiniband:SET_IPOIB_CM=yes/no
+ setting and apply when explicitly requested only (bnc#579555).
+- Fixed ifup-dhcp to check the complete state mark also for
+ dhclient, that reports it now too (bnc#585380,bnc#518219).
+- Fixed dhcpcd-hook to call ifup ... -o dhcp (if-up.d/ifservice
+ scripts) when dhcpcd reports "complete" configuration instead
+ in "up", so also the new hostname is already set (bnc#583800).
+- Fixed to apply (per interface) sysctl settings also in ifup,
+ so changes to the configuration have an effect (bnc#494958).
+- Added scripts/link_wait disabled by default, that can be used
+ via if-up.d to check whether an interface is ready to use or
+ just wait some time in cause of devices that does not report
+ the link state correctly (bnc#570935).
+- Fixed ifdown to stop dhcp, flush IPs and set down interfaces
+ marked BOOTPROTO=none (slave/ports) or the dhcp clients, ...
+ will stay active after a rcnetwork restart when an interface
+ configured with dhcp gets reconfigured as a bridge port or a
+ bonding slave. Fixed ifstatus to report accurate status codes,
+ so rcnetwork does not show red errors for virtual interfaces
+ with STARTMODE=off (bnc#581245,bnc#562030).
+- Fixed ifdown-dhcp to remove pid file that can't be cleaned up
+ when the client has been killed with -KILL (e.g. nfsroot case)
+ and fixed ifdown to not execute ifdown-dhcp twice (bnc#524675).
+- Changed to use expanded option lists for netconfig actions in
+ usage text (bnc#569609).
+- Improved netconfig.8 DNS forwarder/static servers documentation
+ and yast2 meta tags in network/config file to show the currently
+ available settings (bnc#580361,bnc#580506).
+- Filter out loopback addresses from forwarder configs (dnsmasq,
+ bind) in NETCONFIG_DNS_FORWARDER!=resolver mode, so they don't
+ cause any loop and allow them in /etc/resolv.conf to make it
+ possible to get the system running, when the glibc feature to
+ use the name server on the local machine gets broken again or
+ the user wants ipv4 only (bnc#580361,bnc#549447,bnc#441947).
+- Fixed ifdown-dhcp to release a dhcpv6 lease correctly when
+ requested, added a separate DHCLIENT6_RELEASE_BEFORE_QUIT
+ variable (bnc#524675).
+- Consider the bind mounted files scenario instead of symlinks
+ to a writable location in all netconfig calls to create
+ temporary files.
+- Applied patch by agruen@suse.de:
+ When no temporary files can be created next to /etc/resolv.conf
+ (like /etc/resolv.conf.XXXXXXX), create the temporary file in
+ /tmp instead: the root filesystem may be read-only, and
+ /etc/resolv.conf may be bind mounted to a writable location.
+ Likewise for /etc/yp.conf.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sysconfig-0.73.3.tar.bz2
sysconfig-ifstatus-route-proto-filter.bnc572205.diff
sysconfig-same-vlan-id-on-multiple-ifaces.bnc572186.diff
New:
----
sysconfig-0.73.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.IGf49K/_old 2010-03-16 10:45:46.000000000 +0100
+++ /var/tmp/diff_new_pack.IGf49K/_new 2010-03-16 10:45:46.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package sysconfig (Version 0.73.3)
+# spec file for package sysconfig (Version 0.73.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,8 +19,8 @@
Name: sysconfig
-Version: 0.73.3
-Release: 2
+Version: 0.73.4
+Release: 1
Summary: The sysconfig scheme
Group: System/Base
License: GPLv2+
@@ -29,8 +29,6 @@
Requires: iproute2 dbus-1 procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
-Patch1: sysconfig-same-vlan-id-on-multiple-ifaces.bnc572186.diff
-Patch2: sysconfig-ifstatus-route-proto-filter.bnc572205.diff
%description
This package provides the SuSE system configuration scheme.
@@ -51,8 +49,6 @@
%prep
%setup -n sysconfig-%{version}
-%patch1 -p1
-%patch2 -p1
%build
autoreconf --force --install
++++++ sysconfig-0.73.3.tar.bz2 -> sysconfig-0.73.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/ChangeLog new/sysconfig-0.73.4/ChangeLog
--- old/sysconfig-0.73.3/ChangeLog 2010-01-14 16:04:41.000000000 +0100
+++ new/sysconfig-0.73.4/ChangeLog 2010-03-12 18:59:33.000000000 +0100
@@ -1,11 +1,202 @@
------------------------------------------------------------------------
-r2086 | mt | 2010-01-14 16:03:47 +0100 (Thu, 14 Jan 2010) | 2 lines
+r2143 | mt | 2010-03-12 18:58:52 +0100 (Fri, 12 Mar 2010) | 2 lines
Changed paths:
- A /tags/version-0.73.3 (from /trunk:2085)
+ A /tags/version-0.73.4 (from /trunk:2142)
-Tagged sysconfig version 0.73.3
+Tagged sysconfig version 0.73.4
------------------------------------------------------------------------
+r2142 | mt | 2010-03-12 17:17:31 +0100 (Fri, 12 Mar 2010) | 1 line
+Changed paths:
+ M /trunk/VERSION
+ M /trunk/package/sysconfig.changes
+
+Updated changes, version 0.73.4 (sle11-sp1-rc1 merge)
+------------------------------------------------------------------------
+r2141 | mt | 2010-03-12 17:17:27 +0100 (Fri, 12 Mar 2010) | 2 lines
+Changed paths:
+ M /trunk/scripts/network-remotefs
+
+Removed the haldaemon Required-Start/Stop dependency from the
+/etc/init.d/network-remotefs script, NetworkManager dropped it.
+------------------------------------------------------------------------
+r2140 | mt | 2010-03-12 17:17:23 +0100 (Fri, 12 Mar 2010) | 1 line
+Changed paths:
+ M /trunk/package/sysconfig.changes
+ M /trunk/sysconfig.spec.in
+
+Merged change from openSUSE:Factory to not to require hal
+------------------------------------------------------------------------
+r2139 | mt | 2010-03-12 17:17:18 +0100 (Fri, 12 Mar 2010) | 3 lines
+Changed paths:
+ M /trunk/scripts/ifup
+
+Added reading of a temporary startmode in ifdown to skip stopping
+of the interface and avoid shutdown problems when multipathed
+iscsi device was mounted (bnc#581259).
+------------------------------------------------------------------------
+r2138 | mt | 2010-03-12 17:17:15 +0100 (Fri, 12 Mar 2010) | 3 lines
+Changed paths:
+ M /trunk/scripts/ifup-infiniband
+
+Do not use own ipoib mode/umcast defaults in ifup-infiniband
+but honor the /etc/sysconfig/infiniband:SET_IPOIB_CM=yes/no
+setting and apply when explicitly requested only (bnc#579555).
+------------------------------------------------------------------------
+r2137 | mt | 2010-03-12 17:17:11 +0100 (Fri, 12 Mar 2010) | 2 lines
+Changed paths:
+ M /trunk/scripts/ifup-dhcp
+
+Fixed ifup-dhcp to check the complete state mark also for
+dhclient, that reports it now too (bnc#585380,bnc#518219).
+------------------------------------------------------------------------
+r2136 | mt | 2010-03-12 17:17:07 +0100 (Fri, 12 Mar 2010) | 3 lines
+Changed paths:
+ M /trunk/scripts/dhcpcd-hook
+
+Fixed dhcpcd-hook to call ifup ... -o dhcp (if-up.d/ifservice
+scripts) when dhcpcd reports "complete" configuration instead
+in "up", so also the new hostname is already set (bnc#583800).
+------------------------------------------------------------------------
+r2135 | mt | 2010-03-12 17:17:03 +0100 (Fri, 12 Mar 2010) | 2 lines
+Changed paths:
+ M /trunk/scripts/ifup
+
+Fixed to apply (per interface) sysctl settings also in ifup,
+so changes to the configuration have an effect (bnc#494958).
+------------------------------------------------------------------------
+r2134 | mt | 2010-03-12 17:17:00 +0100 (Fri, 12 Mar 2010) | 4 lines
+Changed paths:
+ M /trunk/scripts/Makefile.am
+ A /trunk/scripts/link_wait
+
+Added scripts/link_wait disabled by default, that can be used
+via if-up.d to check whether an interface is ready to use or
+just wait some time in cause of devices that does not report
+the link state correctly (bnc#570935).
+------------------------------------------------------------------------
+r2133 | mt | 2010-03-12 17:16:55 +0100 (Fri, 12 Mar 2010) | 3 lines
+Changed paths:
+ M /trunk/scripts/ifup
+ M /trunk/scripts/ifup-dhcp
+
+Fixed ifdown-dhcp to remove pid file that can't be cleaned up
+when the client has been killed with -KILL (e.g. nfsroot case)
+and fixed ifdown to not execute ifdown-dhcp twice (bnc#524675).
+------------------------------------------------------------------------
+r2132 | mt | 2010-03-12 17:16:51 +0100 (Fri, 12 Mar 2010) | 6 lines
+Changed paths:
+ M /trunk/scripts/ifup
+
+Fixed ifdown to stop dhcp, flush IPs and set down interfaces marked
+BOOTPROTO=none (slave/ports) or the dhcp clients, ... will stay active
+after a rcnetwork restart when a dhcp-configured interface has been
+reconfigured as bridge port or bonding slave. Fixed ifstatus to report
+accurate status codes, so rcnetwork does not show red errors for
+virtual interfaces with STARTMODE=off (bnc#581245,bnc#562030).
+------------------------------------------------------------------------
+r2131 | mt | 2010-03-12 17:16:47 +0100 (Fri, 12 Mar 2010) | 1 line
+Changed paths:
+ M /trunk/sysconfig.spec.in
+
+Updated copyright date in spec.in file
+------------------------------------------------------------------------
+r2130 | mt | 2010-03-12 17:16:44 +0100 (Fri, 12 Mar 2010) | 1 line
+Changed paths:
+ M /trunk/config/sysconfig.dhcp-network
+
+Imoroved to use DHCPv6 RELEASE ...
+------------------------------------------------------------------------
+r2129 | mt | 2010-03-12 17:16:40 +0100 (Fri, 12 Mar 2010) | 2 lines
+Changed paths:
+ M /trunk/scripts/netconfig.d/dns-bind
+ M /trunk/scripts/netconfig.d/dns-dnsmasq
+ M /trunk/scripts/netconfig.d/ntp-runtime
+
+Consider the bind mounted files scenario instead of symlinks to a
+writable location in all netconfig calls to create temporary files.
+------------------------------------------------------------------------
+r2128 | mt | 2010-03-12 17:16:36 +0100 (Fri, 12 Mar 2010) | 6 lines
+Changed paths:
+ M /trunk/scripts/netconfig.d/dns-resolver
+ M /trunk/scripts/netconfig.d/nis
+
+Applied patch by agruen@suse.de from SUSE:SLE-11-SP1:GA project:
+- When no temporary files can be created next to /etc/resolv.conf
+ (like /etc/resolv.conf.XXXXXXX), create the temporary file in
+ /tmp instead: the root filesystem may be read-only, and
+ /etc/resolv.conf may be bind mounted to a writable location.
+ Likewise for /etc/yp.conf.
+------------------------------------------------------------------------
+r2127 | mt | 2010-03-12 17:16:32 +0100 (Fri, 12 Mar 2010) | 1 line
+Changed paths:
+ M /trunk/scripts/ifup-dhcp
+
+Fixed ifdown-dhcp to release a dhcpv6 lease in foreground (bnc#524675).
+------------------------------------------------------------------------
+r2126 | mt | 2010-03-12 17:16:29 +0100 (Fri, 12 Mar 2010) | 1 line
+Changed paths:
+ M /trunk/scripts/netconfig
+
+Changed to use expanded option lists in netconfig actions (bnc#569609).
+------------------------------------------------------------------------
+r2125 | mt | 2010-03-12 17:16:25 +0100 (Fri, 12 Mar 2010) | 5 lines
+Changed paths:
+ M /trunk/scripts/netconfig.d/dns-bind
+ M /trunk/scripts/netconfig.d/dns-dnsmasq
+ M /trunk/scripts/netconfig.d/dns-resolver
+
+Filter out loopback addresses from forwarder configs (bind,dnsmasq)
+in NETCONFIG_DNS_FORWARDER!=resolver mode, so they don't cause any
+loop and allow them in resolv.conf to make it possible to get the
+system running when the glibc feature to use the name server on the
+local machine gets broken again (bnc#580361,bnc#549447,bnc#441947).
+------------------------------------------------------------------------
+r2124 | mt | 2010-03-12 17:16:21 +0100 (Fri, 12 Mar 2010) | 3 lines
+Changed paths:
+ M /trunk/config/sysconfig.config-network
+ M /trunk/doc/netconfig.8
+
+Improved netconfig.8 DNS forwarder/static servers documentation
+and yast2 meta tags in network/config file to show the currently
+available settings (bnc#580361,bnc#580506).
+------------------------------------------------------------------------
+r2123 | mt | 2010-03-12 17:16:17 +0100 (Fri, 12 Mar 2010) | 2 lines
+Changed paths:
+ M /trunk/config/sysconfig.dhcp-network
+ M /trunk/scripts/ifup-dhcp
+
+Fixed ifdown-dhcp to release a dhcpv6 lease correctly when requested,
+added separated variable DHCLIENT6_RELEASE_BEFORE_QUIT (bnc#524675).
+------------------------------------------------------------------------
+r2122 | mt | 2010-03-12 17:16:13 +0100 (Fri, 12 Mar 2010) | 1 line
+Changed paths:
+ M /trunk/package/sysconfig.changes
+
+Updated sysconfig.changes
+------------------------------------------------------------------------
+r2095 | mt | 2010-02-12 12:34:37 +0100 (Fri, 12 Feb 2010) | 1 line
+Changed paths:
+ M /trunk/package/sysconfig.changes
+
+Updated sysconfig.changes
+------------------------------------------------------------------------
+r2088 | mt | 2010-02-05 12:51:36 +0100 (Fri, 05 Feb 2010) | 3 lines
+Changed paths:
+ M /trunk/scripts/ifup-802.1q
+
+Fixed ifup-802.1q script to correctly search for the interface name
+for a vlan id in case multiple interfaces are using same vlan id.
+Thanks to Adrian Ban for providing a fix! (bnc#572186).
+------------------------------------------------------------------------
+r2087 | mt | 2010-02-05 12:51:32 +0100 (Fri, 05 Feb 2010) | 3 lines
+Changed paths:
+ M /trunk/scripts/ifup-route
+
+Added route proto filter to ifstatus-route to evaluate only routes
+that may have been set by ifup-route and skip routes added e.g. by
+zebra to not to waste CPU for big zebra routing tables (bnc#572205).
+------------------------------------------------------------------------
r2085 | mt | 2010-01-14 16:03:18 +0100 (Thu, 14 Jan 2010) | 2 lines
Changed paths:
M /trunk/package/sysconfig.changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/VERSION new/sysconfig-0.73.4/VERSION
--- old/sysconfig-0.73.3/VERSION 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/VERSION 2010-03-12 18:59:05.000000000 +0100
@@ -1 +1 @@
-0.73.3
+0.73.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/config/sysconfig.config-network new/sysconfig-0.73.4/config/sysconfig.config-network
--- old/sysconfig-0.73.3/config/sysconfig.config-network 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/config/sysconfig.config-network 2010-03-12 18:59:04.000000000 +0100
@@ -225,10 +225,13 @@
#
NETCONFIG_DNS_POLICY="auto"
-## Type: string
+## Type: string(resolver,bind,dnsmasq,)
## Default: "resolver"
#
# Defines the name of the DNS forwarder that has to be configured.
+# Currently implemented are "bind", "dnsmasq" and "resolver", that
+# causes to write the name server IP addresses to /etc/resolv.conf
+# only (no forwarder). Empty string defaults to "resolver".
#
NETCONFIG_DNS_FORWARDER="resolver"
@@ -236,6 +239,7 @@
## Default: ""
#
# List of DNS domain names used for host-name lookup.
+# It is written as search list into the /etc/resolv.conf file.
#
NETCONFIG_DNS_STATIC_SEARCHLIST=""
@@ -243,6 +247,12 @@
## Default: ""
#
# List of DNS nameserver IP addresses to use for host-name lookup.
+# When the NETCONFIG_DNS_FORWARDER variable is set to "resolver",
+# the name servers are written directly to /etc/resolv.conf.
+# Otherwise, the nameserver are written into a forwarder specific
+# configuration file and the /etc/resolv.conf does not contain any
+# nameservers causing the glibc to use the name server on the local
+# machine (the forwarder). See also netconfig(8) manual page.
#
NETCONFIG_DNS_STATIC_SERVERS=""
@@ -282,7 +292,7 @@
#
NETCONFIG_NIS_POLICY="auto"
-## Type: string
+## Type: string(yes,no,)
## Default: "yes"
#
# Defines whether to set the default NIS domain. When enabled and no domain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/config/sysconfig.dhcp-network new/sysconfig-0.73.4/config/sysconfig.dhcp-network
--- old/sysconfig-0.73.3/config/sysconfig.dhcp-network 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/config/sysconfig.dhcp-network 2010-03-12 18:59:04.000000000 +0100
@@ -184,6 +184,15 @@
#
DHCLIENT_RELEASE_BEFORE_QUIT="no"
+## Type: yesno
+## Default: no
+#
+# Send a DHCPv6 RELEASE to the server (sign off the address)? (yes|no)
+# This may lead to getting a different address/hostname next time an address
+# is requested. But some servers require it.
+#
+DHCLIENT6_RELEASE_BEFORE_QUIT="no"
+
## Type: integer
## Default: 0
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/configure new/sysconfig-0.73.4/configure
--- old/sysconfig-0.73.3/configure 2010-01-14 16:04:29.000000000 +0100
+++ new/sysconfig-0.73.4/configure 2010-03-12 18:59:19.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Revision: 1.13 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for sysconfig 0.73.3.
+# Generated by GNU Autoconf 2.63 for sysconfig 0.73.4.
#
# Report bugs to http://www.suse.de/feedback/.
#
@@ -746,8 +746,8 @@
# Identity of this package.
PACKAGE_NAME='sysconfig'
PACKAGE_TARNAME='sysconfig'
-PACKAGE_VERSION='0.73.3'
-PACKAGE_STRING='sysconfig 0.73.3'
+PACKAGE_VERSION='0.73.4'
+PACKAGE_STRING='sysconfig 0.73.4'
PACKAGE_BUGREPORT='http://www.suse.de/feedback/'
ac_unique_file="scripts/ifup"
@@ -1481,7 +1481,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 sysconfig 0.73.3 to adapt to many kinds of systems.
+\`configure' configures sysconfig 0.73.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1551,7 +1551,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sysconfig 0.73.3:";;
+ short | recursive ) echo "Configuration of sysconfig 0.73.4:";;
esac
cat <<\_ACEOF
@@ -1651,7 +1651,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sysconfig configure 0.73.3
+sysconfig configure 0.73.4
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1665,7 +1665,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sysconfig $as_me 0.73.3, which was
+It was created by sysconfig $as_me 0.73.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2518,7 +2518,7 @@
# Define the identity of the package.
PACKAGE='sysconfig'
- VERSION='0.73.3'
+ VERSION='0.73.4'
cat >>confdefs.h <<_ACEOF
@@ -12420,7 +12420,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sysconfig $as_me 0.73.3, which was
+This file was extended by sysconfig $as_me 0.73.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12474,7 +12474,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-sysconfig config.status 0.73.3
+sysconfig config.status 0.73.4
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/sysconfig-0.73.3/doc/netconfig.8 new/sysconfig-0.73.4/doc/netconfig.8
--- old/sysconfig-0.73.3/doc/netconfig.8 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/doc/netconfig.8 2010-03-12 18:59:05.000000000 +0100
@@ -182,17 +182,33 @@
.TP
.B NETCONFIG_DNS_POLICY
Defines the DNS merge policy.
+See also the \fBNETCONFIG_\fI<set>\fB_POLICY\fR section.
.TP
.B NETCONFIG_DNS_FORWARDER
-The type of the forwarder type to configure. Valid settings are "resolver",
-"bind" and "dnsmasq". The default setting is "resolver" activating the
-"dns-resolver" module.
+The name of the DNS forwarder that has to be configured. Currently
+implemented are "bind" (dns-bind module), "dnsmasq" (dns-dnsmasq)
+and "resolver" (dns-resolver module), that causes to write the name
+server IP addresses directly to /etc/resolv.conf only (no forwarder).
+Empty string defaults to "resolver", that is also the default setting.
+
+See also \fBNETCONFIG MODULES\fR section for more informations.
.TP
.B NETCONFIG_DNS_STATIC_SEARCHLIST
List of DNS domain names used for host-name lookup.
+
+It is written as search list into the /etc/resolv.conf file.
.TP
.B NETCONFIG_DNS_STATIC_SERVERS
List of namserver IP addresses used for host-name lookup.
+
+When the NETCONFIG_DNS_FORWARDER variable is set to "resolver", the name
+servers are written directly to /etc/resolv.conf.
+
+Otherwise, the nameserver are written into a forwarder specific
+configuration file and the /etc/resolv.conf does not contain any
+nameservers causing the glibc to use the name server on the local
+machine (the forwarder). See also \fBNETCONFIG MODULES\fR section
+for more informations.
.TP
.B NETCONFIG_DNS_RANKING
Allows to specify a custom DNS service ranking list, that is which services
@@ -212,6 +228,7 @@
.TP
.B NETCONFIG_NTP_POLICY
Defines the NTP merge policy.
+See also the \fBNETCONFIG_\fI<set>\fB_POLICY\fR section.
.TP
.B NETCONFIG_NTP_STATIC_SERVERS
List of NTP server IP addresses.
@@ -219,6 +236,7 @@
.SS NIS
.B NETCONFIG_NIS_POLICY
Defines the NIS / YP merge policy.
+See also the \fBNETCONFIG_\fI<set>\fB_POLICY\fR section.
.TP
.BR NETCONFIG_NIS_STATIC_DOMAIN " [ " _ "<number> ]"
A NIS domain name.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/Makefile.am new/sysconfig-0.73.4/scripts/Makefile.am
--- old/sysconfig-0.73.3/scripts/Makefile.am 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/Makefile.am 2010-03-12 18:59:05.000000000 +0100
@@ -29,6 +29,7 @@
if-up.ndp-proxy \
dhcpcd-hook \
extradebug \
+ link_wait \
hwdesc2iface \
move_shm_sysconfig.sh \
create-ifservices-directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/Makefile.in new/sysconfig-0.73.4/scripts/Makefile.in
--- old/sysconfig-0.73.3/scripts/Makefile.in 2010-01-14 16:04:30.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/Makefile.in 2010-03-12 18:59:21.000000000 +0100
@@ -262,6 +262,7 @@
if-up.ndp-proxy \
dhcpcd-hook \
extradebug \
+ link_wait \
hwdesc2iface \
move_shm_sysconfig.sh \
create-ifservices-directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/dhcpcd-hook new/sysconfig-0.73.4/scripts/dhcpcd-hook
--- old/sysconfig-0.73.3/scripts/dhcpcd-hook 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/dhcpcd-hook 2010-03-12 18:59:05.000000000 +0100
@@ -19,7 +19,7 @@
#
# Author: Peter Poeml
#
-# $Id: dhcpcd-hook 2066 2009-12-14 14:10:26Z mt $
+# $Id: dhcpcd-hook 2136 2010-03-12 16:17:07Z mt $
#
@@ -136,9 +136,6 @@
write_cached_config_data dhcp4_state up $INTERFACE
commit_cached_config_data $INTERFACE
- $debug && $log_dbg "Running ifup $INTERFACE -o dhcp"
- ifup $INTERFACE -o dhcp
-
$debug && NC_OPTIONS="-v"
/sbin/netconfig modify -s "dhcpcd" \
-i $INTERFACE $NC_OPTIONS \
@@ -172,8 +169,6 @@
$debug && $log_dbg "Running ifdown $INTERFACE -o dhcp"
ifdown $INTERFACE -o dhcp
- $debug && $log_dbg "Running ifup $INTERFACE -o dhcp"
- ifup $INTERFACE -o dhcp
;;
complete)
# dhcpcd finished all requested configuration steps ...
@@ -183,6 +178,9 @@
/etc/init.d/syslog reload
fi
+ $debug && $log_dbg "Running ifup $INTERFACE -o dhcp"
+ ifup $INTERFACE -o dhcp
+
$debug && $log_dbg "DHCP4 configuration of $INTERFACE is complete"
write_cached_config_data dhcp4_state complete $INTERFACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/ifup new/sysconfig-0.73.4/scripts/ifup
--- old/sysconfig-0.73.3/scripts/ifup 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/ifup 2010-03-12 18:59:05.000000000 +0100
@@ -26,7 +26,7 @@
# Marius Tomaschewski
# Bjoern Jacke
#
-# $Id: ifup 2033 2009-12-03 17:17:42Z mt $
+# $Id: ifup 2139 2010-03-12 16:17:18Z mt $
#
usage () {
@@ -238,8 +238,20 @@
#
if ! is_iface_available $INTERFACE; then
if [ "$SCRIPTNAME" != ifdown ] ; then
- logerror Interface $INTERFACE is not available
- exit $R_NODEV
+ retcode=$R_NODEV
+ retmesg="is not available"
+ case "$STARTMODE" in
+ off)
+ retcode=$R_INACTIVE
+ retmesg="is not active (startmode $STARTMODE)"
+ ;;
+ esac
+ if [ "$RUN_FROM_RC" = yes ] ; then
+ message "`printf " %-9s $retmesg" $INTERFACE`"
+ else
+ logerror "Interface $INTERFACE $retmesg"
+ fi
+ exit $retcode
else
if [ "$RUN_FROM_RC" = yes -o "$HOTPLUG" = yes ] ; then
: just go on, there are things to clean up even if iface has gone
@@ -541,6 +553,13 @@
# check startmode (not for ifdown)
#
# STARTMODE is from config file; MODE is current mode
+#
+# Read temporary startmode
+if [ "$SCRIPTNAME" = ifdown ] ; then
+ tmp_startmode=`read_cached_config_data startmode $INTERFACE`
+ [ -n "$tmp_startmode" ] && STARTMODE="$tmp_startmode"
+fi
+
test "$STARTMODE" = "on" && STARTMODE=auto
test "$STARTMODE" = "boot" && STARTMODE=auto
test "$STARTMODE" = "onboot" && STARTMODE=auto
@@ -670,6 +689,9 @@
fi
if [ "$SCRIPTNAME" = ifup ] ; then
+ # apply (per interface) sysctl settings before anything else
+ scripts/${SCRIPTNAME}-sysctl $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+
# before setting up interfaces we have to configure
# wireless NICs
scripts/${SCRIPTNAME}-wireless $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
@@ -863,7 +885,7 @@
${SCRIPTNAME}-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
retcode=$?
else # called from rcnetwork or manually
- # FIXME: dhcpcd supports autoip...
+ # TODO: dhcpcd supports autoip...
${SCRIPTNAME}-autoip $CONFIG $INTERFACE -o prepare $OPTIONS
${SCRIPTNAME}-dhcp $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
dhcpretcode=$?
@@ -898,7 +920,36 @@
retcode=$?
;;
none)
- :
+ # stop dhcp client, ... on slaves or it may continue
+ # running and have IPs, when the config changed ...
+ case $SCRIPTNAME in
+ ifdown)
+ ifdown-dhcp $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ ifdown-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ # Calling 'ip' if there is no interface (ifdown called from udev for
+ # remove event) would trigger automatic module loading (Bug 199456)
+ if [ -d /sys/class/net/$INTERFACE ] ; then
+ ip addr flush dev $INTERFACE &>/dev/null
+ ip link set dev $INTERFACE down &>/dev/null
+ fi
+ retcode=0 # $?
+ ;;
+ ifstatus)
+ if is_iface_up $INTERFACE ; then
+ message_if_not_run_from_rc "$INTERFACE is up"
+ message_if_not_run_from_rc "$(ip addr show $INTERFACE)"
+ while read a b c d e f g h i; do
+ message "`printf " %-9s IP address: %s" "$i" "$d"`"
+ done < <(ip -o -4 addr show $INTERFACE)
+ ifstatus-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ retcode=$R_SUCCESS
+ else
+ # message_if_not_run_from_rc "$INTERFACE is down"
+ message "`printf " %-9s is down" $INTERFACE`"
+ retcode=$R_INACTIVE
+ fi
+ ;;
+ esac
;;
*)
# TODO: move this to ifup-static script ?
@@ -1047,7 +1098,14 @@
ifup-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
;;
ifdown)
- ifdown-dhcp $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ case "$BOOTPROTO" in
+ dhcp*)
+ # already stopped in dhcp case before
+ ;;
+ *)
+ ifdown-dhcp $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
+ ;;
+ esac
ifdown-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS}
# Calling 'ip' if there is no interface (ifdown called from udev for
# remove event) would trigger automatic module loading (Bug 199456)
@@ -1070,7 +1128,9 @@
# message_if_not_run_from_rc "$INTERFACE is down"
message "`printf " %-9s is down" $INTERFACE`"
retcode=$R_NOTRUNNING
- test "$STARTMODE" = "manual" && retcode=$R_INACTIVE
+ case "$STARTMODE" in
+ manual|off) retcode=$R_INACTIVE ;;
+ esac
fi
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/ifup-802.1q new/sysconfig-0.73.4/scripts/ifup-802.1q
--- old/sysconfig-0.73.3/scripts/ifup-802.1q 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/ifup-802.1q 2010-03-12 18:59:05.000000000 +0100
@@ -109,9 +109,9 @@
}
get_vlan_iface_name()
{
- awk -v vid="$1" -- 'BEGIN{ nt=0; }
+ awk -v vid="$1" -v dev="$2" -- 'BEGIN{ nt=0; }
/^Name-Type:/ { nt=1; next; }
- nt && $3 == vid { print $1; }' \
+ nt && $3 == vid && $5 == dev { print $1; }' \
/proc/net/vlan/config 2>/dev/null
}
del_pad()
@@ -192,7 +192,7 @@
# Don't hurry too much
udevadm settle
- viface=`get_vlan_iface_name "$nr"`
+ viface=`get_vlan_iface_name "$nr" "$ETHERDEVICE"`
if test "x$viface" = x ; then
err_mesg "ERROR: unable to find create vlan $id interface '$INTERFACE'"
exit $R_ERROR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/ifup-dhcp new/sysconfig-0.73.4/scripts/ifup-dhcp
--- old/sysconfig-0.73.3/scripts/ifup-dhcp 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/ifup-dhcp 2010-03-12 18:59:05.000000000 +0100
@@ -18,7 +18,7 @@
# Author: Christian Zoz , 2002-2006
# Peter Poeml , 2002-2006
#
-# $Id: ifup-dhcp 2066 2009-12-14 14:10:26Z mt $
+# $Id: ifup-dhcp 2137 2010-03-12 16:17:11Z mt $
#
usage () {
@@ -607,6 +607,9 @@
test -n "$DHCP4_STATUS" || {
start_dhcp4_dhclient && {
DHCP4_STARTED="yes"
+ write_cached_config_data dhcp4_client $DHCLIENT $INTERFACE
+ write_cached_config_data dhcp4_state started $INTERFACE
+ commit_cached_config_data $INTERFACE
} || DHCP4_STATUS=$?
}
;;
@@ -631,9 +634,6 @@
;;
esac
done
- ### FIXME
- # don't hurry too much...
- ###[ "x$DHCP6_STARTED" = xyes -o "x$DHCP4_STARTED" = xyes ] && sleep 1
#
# in case we've started at least one client, wait the specified
@@ -695,19 +695,20 @@
fi
[ -n "$DHCP4_STATUS" ] && continue
- while read a b c d e f g h i; do
- case "$d" in
- 169.254.*) continue ;;
- esac
- lease="/var/lib/dhcp/dhclient.${INTERFACE}.lease"
- config="/var/lib/dhcp/dhclient.${INTERFACE}.conf"
-
- if [ -e "$lease" -a "$lease" -nt "$config" ] && \
- grep -q "${d%/*}" "$lease" &>/dev/null ; then
- DHCP4_STATUS=$R_SUCCESS
- DHCP4_MESSAGE="IP address: $d"
- fi
- done < <(ip -o -4 addr show $INTERFACE)
+ lease="/var/lib/dhcp/dhclient.${INTERFACE}.lease"
+ config="/var/lib/dhcp/dhclient.${INTERFACE}.conf"
+ state=`read_cached_config_data dhcp4_state $INTERFACE`
+ if [ "x$state" = "xcomplete" -a -e "$lease" -a "$lease" -nt "$config" ] ; then
+ while read a b c d e f g h i ; do
+ case "$d" in
+ 169.254.*) continue ;;
+ esac
+ if grep -q "${d%/*}" "$lease" &>/dev/null ; then
+ DHCP4_MESSAGE="IP address: $d"
+ fi
+ done < <(ip -o -4 addr show $INTERFACE)
+ DHCP4_STATUS=$R_SUCCESS
+ fi
;;
esac
;;
@@ -808,23 +809,31 @@
if [ "$INTERFACE" != all ]; then
ALL_INTERFACES=($INTERFACE)
+ dhcpc4_pids=""
+ dhcpc6_pids=""
+ dhcpc4_signal="-TERM"
+ dhcpc6_signal="-TERM"
+
debug "Shutting down dhcp clients on $INTERFACE"
# first try the configured way
for BOOTPROTO in ${BOOTPROTOS[@]} ; do
case "$BOOTPROTO" in
(dhcp4)
- dhcpcd_on_device="`dhcpc4_on_iface`"
- USE_SIGNAL="-TERM"
+ dhcpc4_pids="`dhcpc4_on_iface`"
case $DHCLIENT in
(dhcpcd)
+ DHCPIFLEASE="/var/lib/dhcpcd/dhcpcd-$INTERFACE.info"
+ DHCPIFPID="/var/run/dhcpcd-$INTERFACE.pid"
+
if test "$STARTMODE" = "nfsroot" ;
then
- USE_SIGNAL="-KILL"
+ dhcpc4_signal="-KILL"
elif test "$DHCLIENT_RELEASE_BEFORE_QUIT" = "yes" ;
then
- USE_SIGNAL="-HUP"
+ $DHCLIENT_BIN --release \
+ $INTERFACE /dev/null
fi
;;
(dhclient)
@@ -833,9 +842,8 @@
if test "$STARTMODE" = "nfsroot" ;
then
- USE_SIGNAL="-KILL"
+ dhcpc4_signal="-KILL"
elif test "$DHCLIENT_RELEASE_BEFORE_QUIT" = "yes" ;
- # -a -f "${DHCPIFLEASE}" ?!
then
$DHCLIENT_BIN -r \
-cf /dev/null \
@@ -846,41 +854,39 @@
;;
esac
- # send termination signal
- for i in $dhcpcd_on_device; do
- kill $USE_SIGNAL $i &>/dev/null
- done
-
- # wait until the processes are gone
- for i in $dhcpcd_on_device; do
- for ((wait=0; wait<=20; wait++)); do
- if test -d /proc/$i ; then
- usleep 300000
- else
- continue 2
- fi
- if [ $wait -eq 20 ]; then
- #message "process $i still not dead, sending SIGKILL"
- kill -KILL $i &>/dev/null
- fi
- done
- done
;;
(dhcp6)
- dhcpcd_on_device="`dhcpc6_on_iface`"
- USE_SIGNAL="-TERM"
+ dhcpc6_pids="`dhcpc6_on_iface`"
case $DHCLIENT6 in
(dhcp6c)
DHCP6IFCONF="/var/lib/dhcpv6/dhcp6c.${INTERFACE}.conf"
DHCP6IFPID="/var/run/dhcp6c.${INTERFACE}.pid"
+
if test "$STARTMODE" = "nfsroot" ;
then
- USE_SIGNAL="-9"
- elif test "$DHCLIENT_RELEASE_BEFORE_QUIT" = "yes" ;
+ dhcpc6_signal="-KILL"
+ elif test "$DHCLIENT6_RELEASE_BEFORE_QUIT" = "yes" ;
then
- $DHCLIENT6_BIN -r all \
+ # dhcp6c daemon needs to get killed or
+ # dhcp6c -r fails to bind the interface
+ for i in $dhcpc6_pids; do
+ kill $dhcpc6_signal $i &>/dev/null
+ done
+ for i in $dhcpc6_pids; do
+ for ((wait=0; wait<=20; wait++)); do
+ if test -d /proc/$i ; then
+ usleep 300000
+ else
+ continue 2
+ fi
+ done
+ done
+
+ # then release the lease but stay in foreground
+ $DHCLIENT6_BIN -f -r all \
-c /dev/null \
+ -p "$DHCP6IFPID" \
$INTERFACE /dev/null
fi
;;
@@ -890,9 +896,8 @@
if test "$STARTMODE" = "nfsroot" ;
then
- USE_SIGNAL="-9"
- elif test "$DHCLIENT_RELEASE_BEFORE_QUIT" = "yes" \
- -a -f "${DHCP6IFLEASE}" ;
+ dhcpc6_signal="-KILL"
+ elif test "$DHCLIENT6_RELEASE_BEFORE_QUIT" = "yes" ;
then
$DHCLIENT_BIN6 -6 -r \
-cf /dev/null \
@@ -903,13 +908,21 @@
;;
esac
+ ;;
+ esac
+ done
+
+ # same game again...
+ for BOOTPROTO in ${BOOTPROTOS[@]} ; do
+ case "$BOOTPROTO" in
+ (dhcp4)
# send termination signal
- for i in $dhcpcd_on_device; do
- kill $USE_SIGNAL $i &>/dev/null
+ for i in $dhcpc4_pids; do
+ kill $dhcpc4_signal $i &>/dev/null
done
# wait until the processes are gone
- for i in $dhcpcd_on_device; do
+ for i in $dhcpc4_pids; do
for ((wait=0; wait<=20; wait++)); do
if test -d /proc/$i ; then
usleep 300000
@@ -917,11 +930,44 @@
continue 2
fi
if [ $wait -eq 20 ]; then
- #message "process $i still not dead, sending SIGKILL"
+ debug "process $i still not dead, sending SIGKILL"
kill -KILL $i &>/dev/null
fi
done
done
+
+ # remove old lease file and pid when they still exist
+ if test "$DHCLIENT_RELEASE_BEFORE_QUIT" = "yes" ; then
+ rm -f "$DHCPIFLEASE"
+ fi
+ rm -f "$DHCPIFPID"
+ ;;
+ (dhcp6)
+ # send termination signal
+ for i in $dhcpc6_pids; do
+ kill $dhcpc6_signal $i &>/dev/null
+ done
+
+ # wait until the processes are gone
+ for i in $dhcpc6_pids; do
+ for ((wait=0; wait<=20; wait++)); do
+ if test -d /proc/$i ; then
+ usleep 300000
+ else
+ continue 2
+ fi
+ if [ $wait -eq 20 ]; then
+ debug "process $i still not dead, sending SIGKILL"
+ kill -KILL $i &>/dev/null
+ fi
+ done
+ done
+
+ # remove old lease file and pid when they still exist
+ if test "$DHCLIENT6_RELEASE_BEFORE_QUIT" = "yes" ; then
+ rm -f "$DHCP6IFLEASE"
+ fi
+ rm -f "$DHCP6IFPID"
;;
esac
done
@@ -960,7 +1006,7 @@
continue 2
fi
if [ $wait -eq 10 ]; then
- #message "process $i still not dead, sending SIGKILL"
+ debug "process $i still not dead, sending SIGKILL"
kill -KILL $i &>/dev/null
fi
done
@@ -1041,7 +1087,9 @@
fi
;;
dhclient)
- if [ -n "`ip -o -f inet addr show $INTERFACE`" ]; then
+ state=`read_cached_config_data dhcp4_state $INTERFACE`
+ if [ "x$state" = "xcomplete" -a \
+ -n "`ip -o -f inet addr show $INTERFACE`" ]; then
:
DHCP4_STATUS=$R_SUCCESS
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/ifup-infiniband new/sysconfig-0.73.4/scripts/ifup-infiniband
--- old/sysconfig-0.73.3/scripts/ifup-infiniband 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/ifup-infiniband 2010-03-12 18:59:05.000000000 +0100
@@ -20,7 +20,7 @@
# Authors: Marius Tomaschewski
# Moni Shoua
#
-# $Id: ifup-infiniband 1708 2008-08-21 06:52:32Z mt $
+# $Id: ifup-infiniband 2138 2010-03-12 16:17:15Z mt $
#
usage () {
@@ -166,17 +166,15 @@
case $ACTION in
up)
# verify values of interface parameters
- IPOIB_MODE=${IPOIB_MODE:-datagram}
case $IPOIB_MODE in
- connected|datagram) ;;
+ connected|datagram|"") ;;
*)
message "illegal value for IPOIB_MODE: $IPOIB_MODE"
exit $R_ERROR
;;
esac
- IPOIB_UMCAST=${IPOIB_UMCAST:-0}
case $IPOIB_UMCAST in
- 0|1) ;;
+ 0|1|"") ;;
*)
message "illegal value for IPOIB_UMCAST: $IPOIB_UMCAST"
exit $R_ERROR
@@ -197,8 +195,12 @@
esac
# set interface parameters
- echo "$IPOIB_MODE" > "/sys/class/net/$INTERFACE/mode"
- echo "$IPOIB_UMCAST" > "/sys/class/net/$INTERFACE/umcast"
+ if test -n "$IPOIB_MODE" ; then
+ echo "$IPOIB_MODE" > "/sys/class/net/$INTERFACE/mode"
+ fi
+ if test -n "$IPOIB_UMCAST" ; then
+ echo "$IPOIB_UMCAST" > "/sys/class/net/$INTERFACE/umcast"
+ fi
;;
down)
case "$INTERFACE" in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/ifup-route new/sysconfig-0.73.4/scripts/ifup-route
--- old/sysconfig-0.73.3/scripts/ifup-route 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/ifup-route 2010-03-12 18:59:05.000000000 +0100
@@ -18,7 +18,7 @@
# Based on rcroute: Burchard Steinbild , 1996
# Werner Fink , 1996-2000
#
-# $Id: ifup-route 1846 2009-03-24 13:36:41Z mt $
+# $Id: ifup-route 2087 2010-02-05 11:51:32Z mt $
#
usage () {
@@ -107,6 +107,33 @@
EXTRAROUTECONF=ifroute-$CONFIG
test -f $EXTRAROUTECONF || EXTRAROUTECONF=""
+# initialize route protos used in files we should consider
+# in the ifstatus check (usually not used, see bnc#572205)
+if [ "$ACTION" = status ] ; then
+ ROUTE_PROTOS=`LANG=C LC_ALL=C awk -- \
+ '$1 !~ /^(#.*)?$/ {
+ if(match($0,"proto ([^ ]+)",p)) {
+ l=length(l) > 0 ? l"|"p[1] : p[1]
+ }
+ }
+ END { print l;}' \
+ $ROUTECONF $EXTRAROUTECONF < /dev/null 2>/dev/null`
+else
+ ROUTE_PROTOS=""
+fi
+
+filter_routes()
+{
+ LANG=C LC_ALL=C awk -vrp="$ROUTE_PROTOS" -- \
+ '/proto [^ ]+/ {
+ if(length(rp) > 0 && match($0,"proto ("rp")")) {
+ print $0;
+ }
+ next;
+ }
+ { print $0;}'
+}
+
#
# add special link local route
# can configure only one interface this way at the moment
@@ -122,7 +149,7 @@
# Don't add this route if interface has no v4 address (Bug 65557)
test -z "`ip -4 a l dev $INTERFACE 2>/dev/null`" && islinklocal=
if test -n "$islinklocal" ; then
- current=`ip -4 route show 169.254.0.0/16`
+ current=`ip -4 route show 169.254.0.0/16 | filter_routes`
if test -z "$current" -o "$current" != "${current/ dev $INTERFACE }"; then
EXTRALINKLOCAL="169.254.0.0/16 - - $INTERFACE"
fi
@@ -215,7 +242,7 @@
# At first look for the current default route interface via 'ip route' and store
# it in $DR_IFACE.
- set -- `ip route`
+ set -- `ip -4 route show | filter_routes`
while [ "$1" != default -a $# -gt 0 ] ; do shift; done
while [ "$1" != dev -a $# -gt 0 ] ; do shift; done
DR_IFACE=$2
@@ -283,7 +310,7 @@
OLDDEFROUTEIFACE=$IFACE
return
fi
- done < <(ip -4 route show)
+ done < <(ip -4 route show | filter_routes)
return 1
}
@@ -318,7 +345,7 @@
*)
ALL_ROUTES="$ALL_ROUTES ${DEST}_${GWAY}_${IFACE}_" ;;
esac
- done < <(ip -4 route show)
+ done < <(ip -4 route show | filter_routes)
declare -i n=0 m=0
fi
@@ -514,7 +541,7 @@
IFACE_ROUTES=""
while read LINE; do
IFACE_ROUTES="${IFACE_ROUTES:+$IFACE_ROUTES\n} $LINE"
- done < <(ip -4 route show dev $INTERFACE 2>/dev/null)
+ done < <(ip -4 route show dev $INTERFACE 2>/dev/null | filter_routes)
test -n "$IFACE_ROUTES" && message_if_not_run_from_rc "Active IPv4 routes for interface $INTERFACE:"
message_if_not_run_from_rc "$IFACE_ROUTES"
test $n -gt 0 && \
@@ -522,7 +549,7 @@
IFACE_ROUTES=""
while read LINE; do
IFACE_ROUTES="${IFACE_ROUTES:+$IFACE_ROUTES\n} $LINE"
- done < <(ip -6 route show dev $INTERFACE 2>/dev/null)
+ done < <(ip -6 route show dev $INTERFACE 2>/dev/null | filter_routes)
test -n "$IFACE_ROUTES" && message_if_not_run_from_rc "Active IPv6 routes for interface $INTERFACE:"
message_if_not_run_from_rc "$IFACE_ROUTES"
test $n -ne $m && exit 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/link_wait new/sysconfig-0.73.4/scripts/link_wait
--- old/sysconfig-0.73.3/scripts/link_wait 1970-01-01 01:00:00.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/link_wait 2010-03-12 18:59:05.000000000 +0100
@@ -0,0 +1,196 @@
+#!/bin/bash
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Germany.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Authors: Marius Tomaschewski
+#
+usage () {
+ echo $@
+ echo "usage: $SCRIPTNAME [<config>] <interface> [-o <options>]"
+ echo ""
+ echo "Options are:"
+ echo " [on]boot : we are currently booting (or shutting down)"
+ echo " debug : be verbose"
+ echo " rc : indicates that we are called from rcnetwork"
+ echo ""
+ echo "Any another options are ignored"
+ echo ""
+ echo "Per interface ifcfg-<config> file variables are:"
+ echo " LINK_WAIT=no (or empty/unset)"
+ echo " - default, don't do anything"
+ echo " LINK_WAIT=check (or yes)"
+ echo " - check the link state flags"
+ echo " LINK_WAIT=<secs>"
+ echo " - seconds to just sleep without any check"
+ echo " LINK_WAIT_PING_IPV4=<ipv4 address to ping>"
+ echo " - sleep half of the time in LINK_WAIT, then"
+ echo " ping the address the rest of the time"
+ echo ""
+ echo "Install using:"
+ echo " ln -s ../scripts/link_wait /etc/sysconfig/network/if-up.d/"
+ echo ""
+ exit $R_USAGE
+}
+
+######################################################################
+# change the working direcory and source some common files
+#
+R_INTERNAL=1 # internal error, e.g. no config or missing scripts
+cd /etc/sysconfig/network || exit $R_INTERNAL
+test -f ./config && . ./config
+test -f scripts/functions && . scripts/functions || exit $R_INTERNAL
+
+######################################################################
+# check arguments and how we are called (in case of links)
+#
+SCRIPTNAME=${0##*/}
+debug $*
+case $1 in ""|-h|*help*) usage ;; esac
+CONFIG="$1"
+shift
+if [ "x$1" != x -a "x$1" != "x-o" ] ; then
+ INTERFACE="$1"
+else
+ INTERFACE="$CONFIG"
+fi
+shift
+test "x$1" = "x-o" && shift
+MODE=''
+RUN_FROM_RC=no
+DEBUG=${DEBUG:-no}
+while [ $# -gt 0 ]; do
+ case $1 in
+ boot|onboot) MODE=onboot ;;
+ debug) DEBUG=yes ;;
+ rc) RUN_FROM_RC=yes ;;
+ *) debug unknown option $1 ;;
+ esac
+ shift
+done
+
+
+# filter out some special interface types
+case "$INTERFACE" in
+ all|noiface|lo) exit 0 ;;
+esac
+is_iface_available "$INTERFACE" || exit 0
+
+# source interface config and make sure we use the
+# per interface setting for wait for link check...
+unset LINK_WAIT
+unset LINK_WAIT_PING_IPV4
+test -f ./ifcfg-$CONFIG && . ./ifcfg-$CONFIG || exit 0
+
+# usage: ifprint message text...
+ifprint() {
+ func=${1} ; shift
+ test "x$func" = x -o "x$INTERFACE" = x && return 1
+ if [ "$RUN_FROM_RC" = yes -a "$INTERFACE" != all ] ; then
+ $func "`printf " %-9s " "$INTERFACE"`$*"
+ else
+ $func "$*"
+ fi
+}
+
+check_link_detected () {
+ local c=`cat /sys/class/net/${1}/carrier 2>/dev/null`
+ local d=`cat /sys/class/net/${1}/dormant 2>/dev/null`
+ local o=`cat /sys/class/net/${1}/operstate 2>/dev/null`
+
+ debug "link detection ${1}: carrier=$c, dormant=$d, operstate=$o"
+
+ if test -e "/sys/class/net/${1}/operstate" ; then
+ # SLE 11 has carrier + operstate + dormant
+ test "$c" = "1" -a "$d" = "0" -a \
+ \( "$o" = "up" -o "$o" = "unknown" \) && return 0
+ else
+ # SLE 10 does not have operstate/dormant
+ test "$c" = "1" && return 0
+ fi
+}
+
+case $SCRIPTNAME in
+*if-up.d*)
+ if test "$MODE" = onboot -a "${LINK_WAIT:-no}" != no ;
+ then
+ test "$LINK_WAIT" = yes && LINK_WAIT=check
+
+ if test "$LINK_WAIT" != check -a $(( $LINK_WAIT )) -gt 0 ;
+ then
+ # don't wait more than WAIT_FOR_INTERFACES / 3
+ test $(( $LINK_WAIT )) -gt \
+ $(( $WAIT_FOR_INTERFACES / 4 )) && \
+ LINK_WAIT=$(( $WAIT_FOR_INTERFACES / 4 ))
+
+ case $LINK_WAIT_PING_IPV4 in
+ (*\.*\.*\.*)
+ declare -i secs=$(( $LINK_WAIT / 2 ))
+
+ ifprint message "waiting $secs secs"
+ sleep $secs
+
+ ifprint message "pinging $LINK_WAIT_PING_IPV4 up to $secs secs"
+ ping -I $INTERFACE -w $secs -c 1 $LINK_WAIT_PING_IPV4
+ ifprint message "ping returned $?"
+ ;;
+ (*)
+ declare -i secs=$(( $LINK_WAIT ))
+
+ ifprint message "waiting $secs secs"
+ sleep $secs
+ ;;
+ esac
+ else
+ # don't wait more than WAIT_FOR_INTERFACES / 3
+ declare -i secs=$(( $WAIT_FOR_INTERFACES / 4 ))
+ declare -i lmax=$secs
+ declare -i loop=0
+ case $LINK_WAIT_PING_IPV4 in
+ (*\.*\.*\.*) lmax=$(( $lmax / 2 )) ;;
+ esac
+
+ check_link_detected "$INTERFACE" || \
+ ifprint message "no link detected ... waiting up to $secs secs"
+
+ while ! check_link_detected "$INTERFACE" ; do
+ sleep 1
+ test $((++loop)) -ge $lmax && break
+ done
+
+ check_link_detected "$INTERFACE" \
+ && ifprint message "link detected after $loop secs" \
+ || ifprint message "no link detected ... continue"
+
+ case $LINK_WAIT_PING_IPV4 in
+ (*\.*\.*\.*)
+ ifprint message "pinging $LINK_WAIT_PING_IPV4 up to $secs secs"
+ ping -I $INTERFACE -w $(( $secs - $loop )) -c 1 $LINK_WAIT_PING_IPV4
+ ifprint message "ping returned $?"
+ ;;
+ esac
+ fi
+
+ fi
+;;
+*if-down.d*)
+;;
+*)
+ usage
+;;
+esac
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/netconfig new/sysconfig-0.73.4/scripts/netconfig
--- old/sysconfig-0.73.3/scripts/netconfig 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/netconfig 2010-03-12 18:59:05.000000000 +0100
@@ -314,15 +314,21 @@
update Updates the managed files with the current set of settings.
modify options:
+ < -s|--service <service name> > service providing settings
+ [ -i|--interface <interface name> ] interface providing settings
[ -F|--input-format <input format> ] currently 'dhcpcd' supported only
[ -I|--input-file <file name> ] file name to read, stdin by default
[ -l|--lease-file <file name> ] alias for --input-file
- {remove options}
+ [ -m|--module-only ] module or module group updates only
+ [ -f|--force-replace ] generate files, even user modified
+ [ -v|--verbose ] enable debug and be verbose
remove options:
< -s|--service <service name> > service providing settings
[ -i|--interface <interface name> ] interface providing settings
- {update options}
+ [ -m|--module-only ] module or module group updates only
+ [ -f|--force-replace ] generate files, even user modified
+ [ -v|--verbose ] enable debug and be verbose
update options:
[ -m|--module-only ] module or module group updates only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/netconfig.d/dns-bind new/sysconfig-0.73.4/scripts/netconfig.d/dns-bind
--- old/sysconfig-0.73.3/scripts/netconfig.d/dns-bind 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/netconfig.d/dns-bind 2010-03-12 18:59:05.000000000 +0100
@@ -56,11 +56,9 @@
local NAMESERVER=()
# DESTFILE may be a symlink on a read only /-fs
- # when, then $r/etc/named.d is be symlinked,
- # there is IMO no need to follow symlink...
- #DST_FILE=`read_symlink "${DESTFILE}"`
- DST_FILE="${DESTFILE}"
- TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"` || return 1
+ DST_FILE=`read_symlink "${DESTFILE}"`
+ TMP_FILE=`mktemp "${DST_FILE}.XXXXXX" 2>/dev/null || \
+ mktemp -t "${DST_FILE##*/}.XXXXXX"` || return 1
if test ! -s "$DST_FILE" ; then
touch "$DST_FILE" ; chmod 644 "$DST_FILE"
@@ -242,6 +240,20 @@
DNS_SERVERS_2="$DNS_SERVERS_2 $NETCONFIG_DNS_STATIC_SERVERS"
fi
+# filter out loopback addresses that would case a loop
+for idx in 0 1 2 ; do
+ var="DNS_SERVERS_$idx"
+ val=(${!var})
+ new=()
+ for ns in ${val[@]} ; do
+ case $ns in
+ 127.*|::1) ;;
+ *) new+=("$ns") ;;
+ esac
+ done
+ eval "${var}='${new[@]}'"
+done
+
write_named_forwarders "$DNS_SERVERS_0 $DNS_SERVERS_1 $DNS_SERVERS_2"
RET=$?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/netconfig.d/dns-dnsmasq new/sysconfig-0.73.4/scripts/netconfig.d/dns-dnsmasq
--- old/sysconfig-0.73.3/scripts/netconfig.d/dns-dnsmasq 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/netconfig.d/dns-dnsmasq 2010-03-12 18:59:05.000000000 +0100
@@ -57,7 +57,8 @@
# DESTFILE may be a symlink on a read only /-fs
DST_FILE=`read_symlink "${DESTFILE}"`
- TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"` || return 1
+ TMP_FILE=`mktemp "${DST_FILE}.XXXXXX" 2>/dev/null || \
+ mktemp -t "${DST_FILE##*/}.XXXXXX"` || return 1
if test ! -s "$DST_FILE" ; then
touch "$DST_FILE" ; chmod 644 "$DST_FILE"
@@ -241,6 +242,20 @@
DNS_SERVERS_2="$DNS_SERVERS_2 $NETCONFIG_DNS_STATIC_SERVERS"
fi
+# filter out loopback addresses that would case a loop
+for idx in 0 1 2 ; do
+ var="DNS_SERVERS_$idx"
+ val=(${!var})
+ new=()
+ for ns in ${val[@]} ; do
+ case $ns in
+ 127.*|::1) ;;
+ *) new+=("$ns") ;;
+ esac
+ done
+ eval "${var}='${new[@]}'"
+done
+
write_dnsmasq_forwarders "$DNS_SERVERS_0 $DNS_SERVERS_1 $DNS_SERVERS_2"
RET=$?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/netconfig.d/dns-resolver new/sysconfig-0.73.4/scripts/netconfig.d/dns-resolver
--- old/sysconfig-0.73.3/scripts/netconfig.d/dns-resolver 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/netconfig.d/dns-resolver 2010-03-12 18:59:05.000000000 +0100
@@ -66,7 +66,8 @@
# DESTFILE may be a symlink on a read only /-fs
DST_FILE=`read_symlink "${DESTFILE}"`
- TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"` || return 1
+ TMP_FILE=`mktemp "${DST_FILE}.XXXXXX" 2>/dev/null || \
+ mktemp -t "${DST_FILE##*/}.XXXXXX"` || return 1
if test ! -s "$DST_FILE" ; then
touch "$DST_FILE" ; chmod 644 "$DST_FILE"
@@ -288,7 +289,19 @@
# the name server on the local machine then ...
if [ "$NETCONFIG_DNS_FORWARDER" != "resolver" -a \
"$NETCONFIG_DNS_FORWARDER" != "" ]; then
- unset ${!DNS_SERVERS_*}
+ # write explicitly specified loopback addresses (when any);
+ # everything else will go into the forwarder specific config.
+ for idx in 0 1 2 ; do
+ var="DNS_SERVERS_$idx"
+ val=(${!var})
+ new=()
+ for ns in ${val[@]} ; do
+ case $ns in
+ 127.*|::1) new+=("$ns") ;;
+ esac
+ done
+ eval "${var}='${new[@]}'"
+ done
fi
write_resolv_conf "$DNS_SEARCHLIST_0 $DNS_SEARCHLIST_1 $DNS_SEARCHLIST_2" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/netconfig.d/nis new/sysconfig-0.73.4/scripts/netconfig.d/nis
--- old/sysconfig-0.73.3/scripts/netconfig.d/nis 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/netconfig.d/nis 2010-03-12 18:59:05.000000000 +0100
@@ -153,7 +153,8 @@
{
# DESTFILE may be a symlink on a read only /-fs
DST_FILE=`read_symlink "${DESTFILE}"`
- TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"`
+ TMP_FILE=`mktemp "${DST_FILE}.XXXXXX" 2>/dev/null || \
+ mktemp -t "${DST_FILE##*/}.XXXXXX"` || return 1
if test ! -s "$DST_FILE" ; then
touch "$DST_FILE" ; chmod 644 "$DST_FILE"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/netconfig.d/ntp-runtime new/sysconfig-0.73.4/scripts/netconfig.d/ntp-runtime
--- old/sysconfig-0.73.3/scripts/netconfig.d/ntp-runtime 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/netconfig.d/ntp-runtime 2010-03-12 18:59:05.000000000 +0100
@@ -61,7 +61,7 @@
local SERVERS
- TMP_FILE=`mktemp "$r/tmp/ntp-servers-netconfig.XXXXXX"` || return 1
+ TMP_FILE=`mktemp -t "ntp-servers-netconfig.XXXXXX"` || return 1
if test ! -s "$DESTFILE" ; then
touch "$DESTFILE" ; chmod 644 "$DESTFILE"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/scripts/network-remotefs new/sysconfig-0.73.4/scripts/network-remotefs
--- old/sysconfig-0.73.3/scripts/network-remotefs 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/scripts/network-remotefs 2010-03-12 18:59:05.000000000 +0100
@@ -20,15 +20,15 @@
#
# Author: Marius Tomaschewski
#
-# $Id: network-remotefs 1838 2009-01-23 17:08:12Z mt $
+# $Id: network-remotefs 2141 2010-03-12 16:17:27Z mt $
#
# /etc/init.d/network-remotefs
#
### BEGIN INIT INFO
# Provides: network-remotefs
-# Required-Start: $network $remote_fs haldaemon
+# Required-Start: $network $remote_fs
# Should-Start:
-# Required-Stop: $network $remote_fs haldaemon
+# Required-Stop: $network $remote_fs
# Should-Stop:
# Default-Start: 2 3 5
# Default-Stop:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/sysconfig.spec new/sysconfig-0.73.4/sysconfig.spec
--- old/sysconfig-0.73.3/sysconfig.spec 2010-01-14 16:04:37.000000000 +0100
+++ new/sysconfig-0.73.4/sysconfig.spec 2010-03-12 18:59:27.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package sysconfig (Version 0.73.3)
+# spec file for package sysconfig (Version 0.73.4)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,14 +19,14 @@
Name: sysconfig
-Version: 0.73.3
+Version: 0.73.4
Release: 0
Summary: The sysconfig scheme
Group: System/Base
License: GPLv2+
AutoReqProv: on
PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep
-Requires: iproute2 dbus-1 hal procps
+Requires: iproute2 dbus-1 procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.73.3/sysconfig.spec.in new/sysconfig-0.73.4/sysconfig.spec.in
--- old/sysconfig-0.73.3/sysconfig.spec.in 2010-01-14 16:04:16.000000000 +0100
+++ new/sysconfig-0.73.4/sysconfig.spec.in 2010-03-12 18:59:05.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysconfig (Version @VERSION@)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
License: GPLv2+
AutoReqProv: on
PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep
-Requires: iproute2 dbus-1 hal procps
+Requires: iproute2 dbus-1 procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org