Hello community,
here is the log from the commit of package sysconfig
checked in at Fri Nov 28 16:04:55 CET 2008.
--------
--- sysconfig/sysconfig.changes 2008-11-18 00:14:25.000000000 +0100
+++ sysconfig/sysconfig.changes 2008-11-27 16:29:46.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Nov 27 16:24:40 CET 2008 - mt(a)suse.de
+
+- Added DHCLIENT_USE_LAST_LEASE (-E/--lastlease) dhcpcd option to
+ dhcp config and ifup-dhcp script, addopted new DHCLIENT_TIMEOUT
+ default 20 and increased WAIT_FOR_INTERFACES to 30 to allow
+ dhcpcd to use the old lease in time (fate#302402, bnc#447237).
+
+-------------------------------------------------------------------
+Wed Nov 26 22:03:53 CET 2008 - mt(a)suse.de
+
+- Fixed obsolete ntp-runtime decription in netconfig.8 (bnc#446545).
+- Fixed rcnetwork remotefs virtual iface start order (bnc#447098).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
sysconfig-ifup-dhcp-dhcpcd-lastlease.bnc447237.diff
sysconfig-netconfig-8-man-page.bnc446545.diff
sysconfig-network-remotefs-virtual-order.bnc447098.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.o23388/_old 2008-11-28 16:04:10.000000000 +0100
+++ /var/tmp/diff_new_pack.o23388/_new 2008-11-28 16:04:10.000000000 +0100
@@ -20,7 +20,7 @@
Name: sysconfig
Version: 0.71.11
-Release: 2
+Release: 3
Summary: The sysconfig scheme
Group: System/Base
License: GPL v2 or later
@@ -34,6 +34,9 @@
Patch1: %{name}-bonding-slave-resolve.bnc429858.diff
Patch2: %{name}-do-not-create-ntp-dir.bnc443326.diff
Patch3: %{name}-skip-ifup-hotplug-for-bridges.bnc443749.diff
+Patch4: %{name}-netconfig-8-man-page.bnc446545.diff
+Patch5: %{name}-network-remotefs-virtual-order.bnc447098.diff
+Patch6: %{name}-ifup-dhcp-dhcpcd-lastlease.bnc447237.diff
%description
This package provides the SuSE system configuration scheme.
@@ -58,6 +61,9 @@
%patch1 -p0
%patch2 -p0
%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
%build
autoreconf --force --install
@@ -201,8 +207,16 @@
done
popd > /dev/null
#
+## we provide own, improved variant of the remove_and_set suse
+## rpm macro that is able to handle files in subdirs, and more
+. etc/sysconfig/network/scripts/functions.rpm-utils
+#
%{fillup_and_insserv -fY network}
%{fillup_and_insserv -fY network-remotefs}
+if test -f etc/sysconfig/network/dhcp ; then
+ # remove first, we need the new default value
+ sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
+fi
%{fillup_only -dns dhcp network network}
%{fillup_only -dns config network network}
/sbin/ldconfig
@@ -212,11 +226,6 @@
#
# * update to >= 11.1 / SLE11:
#
-if test -f etc/sysconfig/network/scripts/functions.rpm-utils ; then
- # we provide own, improved variant of the remove_and_set suse
- # rpm macro that is able to handle files in subdirs, and more
- . etc/sysconfig/network/scripts/functions.rpm-utils
-fi
# convert dns / modify_resolvconf to netconfig
if [ -e etc/sysconfig/network/scripts/convert_to_netconfig_dns ] ; then
ROOT=$PWD bash etc/sysconfig/network/scripts/convert_to_netconfig_dns
@@ -248,6 +257,14 @@
%{stop_on_removal network}
%changelog
+* Thu Nov 27 2008 mt(a)suse.de
+- Added DHCLIENT_USE_LAST_LEASE (-E/--lastlease) dhcpcd option to
+ dhcp config and ifup-dhcp script, addopted new DHCLIENT_TIMEOUT
+ default 20 and increased WAIT_FOR_INTERFACES to 30 to allow
+ dhcpcd to use the old lease in time (fate#302402, bnc#447237).
+* Wed Nov 26 2008 mt(a)suse.de
+- Fixed obsolete ntp-runtime decription in netconfig.8 (bnc#446545).
+- Fixed rcnetwork remotefs virtual iface start order (bnc#447098).
* Fri Nov 14 2008 hare(a)suse.de
- Update hwcfg2rules script to handle hsi and iucv devices
correctly (bnc#440570)
++++++ sysconfig-ifup-dhcp-dhcpcd-lastlease.bnc447237.diff ++++++
--- config/sysconfig.config-network
+++ config/sysconfig.config-network 2008/11/26 14:29:22
@@ -127,13 +127,13 @@ CONNECTION_SEND_KILL_SIGNAL="no"
MANDATORY_DEVICES=""
## Type: integer
-## Default: 20
+## Default: 30
#
# Some interfaces need some time to come up or come asynchronously via hotplug.
# WAIT_FOR_INTERFACES is a global wait for all mandatory interfaces in
# seconds. If empty no wait occurs.
#
-WAIT_FOR_INTERFACES="20"
+WAIT_FOR_INTERFACES="30"
## Type: yesno
## Default: yes
--- config/sysconfig.dhcp-network
+++ config/sysconfig.dhcp-network 2008/11/27 15:23:03
@@ -76,19 +76,32 @@ DHCLIENT_SET_DEFAULT_ROUTE="yes"
#
DHCLIENT_LEASE_TIME=""
+## Type: yesno
+## Default: yes
+#
+# dhcpcd -E/--lastlease option
+#
+# This setting controls whether dhcpcd should try to use DHCP settings
+# provided in its last lease when the dhcp-server is not reachable and
+# the lease hasn't expired yet.
+# Set this variable to "no" to disable the fallback to the last lease.
+#
+DHCLIENT_USE_LAST_LEASE=yes
+
## Type: integer
-## Default: 999999
+## Default: ""
#
-# (only dhcpcd does use this setting)
+# dhcpcd -t/--timeout option
#
-# You can set the timeout (dhcpcd will terminate after this time when it
-# does not get a reply from the server).
+# Specify the time after the dhcpcd should try subsequent actions like
+# last-lease handling (when DHCLIENT_USE_LAST_LEASE enabled), when the
+# dhcp-server is not reachable. The dhcpcd default timeout is 20 seconds.
#
-# The default timeout of dhcpcd is 20 seconds. However, we'll set it to a
-# much longer time. dhcpcd will then run as a daemon in the background and
-# broadcast a DHCPDISCOVER once in a while, trying to get a lease.
+# Note: In the past, this setting was set to a much higher value (999999)
+# by default, because the dhcpcd < 3.2.3 terminated after this time when
+# it was unable to get a lease from the dhcp server.
#
-DHCLIENT_TIMEOUT="999999"
+DHCLIENT_TIMEOUT=""
## Type: string
## Default: AUTO
--- scripts/ifup-dhcp
+++ scripts/ifup-dhcp 2008/11/27 14:20:31
@@ -267,6 +267,7 @@ start_dhcp4_dhcpcd() {
args="--netconfig -L"
#test "$AUTOIP" != "yes" && args="$args -L"
+ test "$DHCLIENT_USE_LAST_LEASE" = "yes" && args="$args -E"
test "$DHCLIENT_DEBUG" = "yes" && args="$args -d"
test "$DHCLIENT_SET_HOSTNAME" = "yes" && args="$args -HHH"
test "$DHCLIENT_SET_DEFAULT_ROUTE" != "yes" && args="$args -G"
++++++ sysconfig-netconfig-8-man-page.bnc446545.diff ++++++
--- doc/netconfig.8
+++ doc/netconfig.8 2008/11/26 14:21:21
@@ -256,7 +256,7 @@
The list of the NTP servers is written to the \fI/var/run/ntp/servers-netconfig\fR
file and if the configuration changed meanwhile, the ntp service will be restarted
using "rcntp try-restart". The ntp init script provides the functionality to apply
-the runtime server list at runtime using the \fBntpdc\fR(1) program.
+the server list at runtime to the \fBntpd\fR(1) daemon.
.TP
.B nis
This module writes the NIS configuration into the \fI/etc/ypconf\fR file and
++++++ sysconfig-network-remotefs-virtual-order.bnc447098.diff ++++++
--- scripts/functions
+++ scripts/functions 2008/11/26 20:41:00
@@ -127,6 +127,7 @@ get_ethtool_drv_info () {
if [ ! -x $ethtool ] ; then
[ -x /usr${ethtool} ] && ethtool="/usr${ethtool}" || return 1
fi
+ local key val
$ethtool -i "$IF" 2>/dev/null |
while read key val ; do
case "$key" in
@@ -150,7 +151,7 @@ get_iface_type () {
test -f /proc/net/vlan/$IF && TYPE=vlan
test -d /sys/class/net/$IF/bonding && TYPE=bond
test -d /sys/devices/virtual/net/$IF && {
- eval local `get_ethtool_drv_info $IF`
+ eval local x `get_ethtool_drv_info $IF`
test "$ETHTOOL_DRV_NAME" == "tun" && \
TYPE="$ETHTOOL_DRV_BUS_INFO" || \
case $IF in tap*) TYPE=tap ;; esac
--- scripts/network
+++ scripts/network 2008/11/26 20:43:19
@@ -593,6 +593,9 @@ if test "x$FS_FILTER" != x ; then
$ALL_MANDATORY_SLAVES
ALL_VIRTUAL_IFACES=$VIRTUAL_IFACES
+ resolve_iface_startorder ALL_VIRTUAL_IFACES \
+ "$ALL_VIRTUAL_IFACES" \
+ "$PHYSICAL_IFACES $MANDATORY_DEVICES $MANDATORY_SLAVES"
resolve_iface_startorder LFS_VIRTUAL_IFACES \
"$ALL_VIRTUAL_IFACES" \
"$LFS_PHYSICAL_IFACES $LFS_MANDATORY_DEVICES $LFS_MANDATORY_SLAVES" \
@@ -607,7 +610,7 @@ if test "x$FS_FILTER" != x ; then
debug "* Modifications by $FS_FILTER filter:"
debug "PHYSICAL_IFACES => $LFS_PHYSICAL_IFACES + $RFS_PHYSICAL_IFACES = $ALL_PHYSICAL_IFACES"
debug "NOT_PHYSICAL_IFACES => $LFS_NOT_PHYSICAL_IFACES + $RFS_NOT_PHYSICAL_IFACES = $ALL_NOT_PHYSICAL_IFACES"
- debug "MANDATORY_DEVICES => $LFS_MANDATORY_DEVICES + $RFS_MANDATORY_DEVICES = ALL_MANDATORY_DEVICES"
+ debug "MANDATORY_DEVICES => $LFS_MANDATORY_DEVICES + $RFS_MANDATORY_DEVICES = $ALL_MANDATORY_DEVICES"
debug "MANDATORY_SLAVES => $LFS_MANDATORY_SLAVES + $RFS_MANDATORY_SLAVES = $ALL_MANDATORY_SLAVES"
debug "VIRTUAL_IFACES => $LFS_VIRTUAL_IFACES + $RFS_VIRTUAL_IFACES = $ALL_VIRTUAL_IFACES"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
