Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory
checked in at Fri Jan 7 09:15:25 CET 2011.
--------
--- sysconfig/sysconfig.changes 2010-12-07 12:23:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2010-12-09 16:13:47.000000000 +0100
@@ -1,0 +2,17 @@
+Thu Dec 9 15:13:27 UTC 2010 - mt@suse.de
+
+- version 0.74.3
+- Use iBFT primary or PXE BOOTIF inteface as primary dhcp interface
+ (sets the default route and hostname) and the "first up interface
+ wins" selection used before as fallback, when there is explicit
+ user configuration available. Updated the DHCLIENT_PRIMARY_DEVICE
+ variable description, added it also to the global network/dhcp
+ config file (bnc#653365).
+- Improved default vlan name scheme docs in ifcfg-vlan.5 man page.
+- Use startmode auto instead of onboot in ifcfg-lo (bnc#533818)
+- Dropped obsolete and confusing etc/modprobe.d/50-ipv6.conf file
+ (bnc#632530, bnc#656916).
+- Fixed link_wait scriptname check and ping usage (bnc#644738);
+ improved to allow the user to specify the steps.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sysconfig-0.74.2.tar.bz2
New:
----
sysconfig-0.74.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.xc8HQf/_old 2011-01-07 09:15:12.000000000 +0100
+++ /var/tmp/diff_new_pack.xc8HQf/_new 2011-01-07 09:15:12.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package sysconfig (Version 0.74.2)
+# spec file for package sysconfig (Version 0.74.3)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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,8 +19,8 @@
Name: sysconfig
-Version: 0.74.2
-Release: 2
+Version: 0.74.3
+Release: 1
Summary: The system configuration scheme
Url: http://gitorious.org/opensuse/sysconfig
Group: System/Base
@@ -102,7 +102,6 @@
%dir /etc/modprobe.d
%config /etc/sysconfig/network/ifcfg.template
%config /etc/modprobe.d/50-blacklist.conf
-%config(noreplace) /etc/modprobe.d/50-ipv6.conf
/etc/sysconfig/network/scripts/*
/etc/sysconfig/network/if-up.d/ndp-proxy
/etc/sysconfig/network/if-down.d/ndp-proxy
@@ -187,15 +186,6 @@
done
# erroneous move from network/dhcp to network/config while 11.1 beta
sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS
-#
-# * update to >= 11.2
-#
-# FIXME: use disable_ipv6
-# move ipv6 settings created by yast2-network before 11.2
-#
-if test -f etc/modprobe.d/ipv6 ; then
- mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf
-fi
%postun
%{insserv_cleanup}
++++++ sysconfig-0.74.2.tar.bz2 -> sysconfig-0.74.3.tar.bz2 ++++++
++++ 14613 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/ChangeLog new/sysconfig-0.74.3/ChangeLog
--- old/sysconfig-0.74.2/ChangeLog 2010-11-11 14:42:45.000000000 +0100
+++ new/sysconfig-0.74.3/ChangeLog 2011-01-06 10:53:18.000000000 +0100
@@ -1,4 +1,62 @@
-commit 7cda3f6f76b177f2cbc3aa91e84fffbba2508ffa (HEAD, master)
+commit e38938065e356e5b96ee42ea616c1796037fd89b (HEAD, origin/master, export/master, opensuse-11.4)
+Author: Marius Tomaschewski
+Date: Wed Jan 5 16:58:56 2011 +0100
+
+ version 0.74.3, updated sysconfig.changes
+
+commit 9f83ac4f48920bc5d781d75702ccd59a4dae2944
+Author: Marius Tomaschewski
+Date: Thu Dec 9 16:16:51 2010 +0100
+
+ Use iBFT primary or PXE BOOTIF as primary in dhcp
+
+ Use iBFT primary or PXE BOOTIF inteface as primary dhcp interface
+ (sets the default route and hostname) and the "first up interface
+ wins" selection used before as fallback, when there is explicit
+ user configuration available. Updated the DHCLIENT_PRIMARY_DEVICE
+ variable description, added it also to the global network/dhcp
+ config file (bnc#653365).
+
+commit e4aca9a3dc0853c6087fdf271a7ae18440e7c0cf
+Author: Marius Tomaschewski
+Date: Thu Dec 9 14:13:56 2010 +0100
+
+ Merged changes from openSUSE:Factory
+
+commit c2285de766d1b4146d7215bafea5bc1f0a2e3fa6
+Author: Marius Tomaschewski
+Date: Thu Dec 9 14:09:41 2010 +0100
+
+ Default vlan name scheme in ifcfg-vlan.5 man page
+
+ Make it clear, that <ifname>.<vlan-id> (eth0.42) is the default and
+ prefered name scheme for vlan interfaces.
+
+commit de4ae9ea2c1617fde5594ef99a136180df9e0fd5
+Author: Marius Tomaschewski
+Date: Thu Dec 9 10:12:03 2010 +0100
+
+ Use startmode auto instead of onboot in ifcfg-lo
+
+ The startmode onboot is still valid, but a backward compatibility
+ alias to auto (bnc#533818).
+
+commit ed94c15257f8816eff66f7d603c2152fa4950718
+Author: Marius Tomaschewski
+Date: Wed Dec 1 15:51:17 2010 +0100
+
+ Dropped obsolete /etc/modprobe.d/50-ipv6.conf (see bnc#632530)
+
+commit 10da7e74aff7ecb6399fc8bcf126689a0b3be64e
+Author: Marius Tomaschewski
+Date: Tue Nov 16 18:02:03 2010 +0100
+
+ Fixed link_wait scriptname check improved the script
+
+ Fixed link_wait scriptname check and ping usage (bnc#644738);
+ improved to allow the user to specify the steps.
+
+commit 7cda3f6f76b177f2cbc3aa91e84fffbba2508ffa
Author: Marius Tomaschewski
Date: Thu Nov 11 14:42:03 2010 +0100
@@ -25,7 +83,7 @@
Signed-off-by: Marius Tomaschewski
-commit 7a325b566171b4c696c7e55567f6ba2aea59fe20 (origin/master, export/master)
+commit 7a325b566171b4c696c7e55567f6ba2aea59fe20
Author: Marius Tomaschewski
Date: Tue Oct 26 13:16:42 2010 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/hardware/50-ipv6.conf new/sysconfig-0.74.3/config/hardware/50-ipv6.conf
--- old/sysconfig-0.74.2/config/hardware/50-ipv6.conf 2010-11-05 14:01:26.000000000 +0100
+++ new/sysconfig-0.74.3/config/hardware/50-ipv6.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-#
-# Using this file does not work when the module is compiled
-# into the kernel (11.2 and above). Instead, please use the
-# net.ipv6.conf.all.disable_ipv6 = 1
-# global sysctl setting in /etc/sysctl.conf or also a per
-# interface settings in ifsysctl(5) files.
-#
-
-# Comment out to disable IPv6:
-#install ipv6 /bin/true
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/hardware/Makefile.am new/sysconfig-0.74.3/config/hardware/Makefile.am
--- old/sysconfig-0.74.2/config/hardware/Makefile.am 2010-10-05 22:42:15.000000000 +0200
+++ new/sysconfig-0.74.3/config/hardware/Makefile.am 2011-01-06 10:45:47.000000000 +0100
@@ -5,7 +5,7 @@
udevrules_DATA = 81-mount.rules
-modprobe_DATA = 50-blacklist.conf 50-ipv6.conf
+modprobe_DATA = 50-blacklist.conf
EXTRA_DIST = $(modprobe_DATA) $(udevrules_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/ifcfg-lo new/sysconfig-0.74.3/config/ifcfg-lo
--- old/sysconfig-0.74.2/config/ifcfg-lo 2010-01-20 17:57:54.000000000 +0100
+++ new/sysconfig-0.74.3/config/ifcfg-lo 2011-01-06 10:45:47.000000000 +0100
@@ -4,6 +4,6 @@
NETWORK=127.0.0.0
BROADCAST=127.255.255.255
IPADDR_2=127.0.0.2/8
-STARTMODE=onboot
+STARTMODE=auto
USERCONTROL=no
FIREWALL=no
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/ifcfg.template new/sysconfig-0.74.3/config/ifcfg.template
--- old/sysconfig-0.74.2/config/ifcfg.template 2010-11-05 14:01:26.000000000 +0100
+++ new/sysconfig-0.74.3/config/ifcfg.template 2011-01-06 10:45:47.000000000 +0100
@@ -212,38 +212,6 @@
UNIQUE=
##########################################################################
-### FIXME:
-### From here one up to 'bridge settings' the file is not up to date
-
-
-## Multiple addresses
-## You can extend the variable name 'IPADDR' by any string you like (IPADDR_1,
-## IPADDR_FOO, IPADDRxxx, ...) and use these variables for your IP addresses.
-## If you need some additional parameters for these addresses, then just add
-## the same extension to these variable names.
-## IPADDR_AAA=1.2.3.4
-## NETMASK_AAA=255.0.0.0
-## BROADCAST_AAA=1.2.3.55
-## IPADDR_BBB=10.10.2.3/16
-## LABEL_BBB=BBB
-## an so on ...
-##
-## You do not need to set a label for any address. But then you should not use
-## ifconfig any longer; go and use ip. If you want to use ifconfig then omit the
-## label for your main address and set a label for every additional address.
-
-## Routing:
-## If you need special routes for a configuration, then use a file named
-## ifroute-<config> where <config> is the same string as in ifcfg-<config>.
-## It has the same syntax like routes except one difference:
-## If you omit the interface name (4th field) in the ifroute file it will be
-## set to the current interface name when setting up the interface. You need to
-## do this with hotpluggable devices, where you do not know which interface name
-## they will get at the time when you plug them.
-## See man 5 routes.
-
-
-##########################################################################
## DHCP settings
## Type: list("",yes,no)
@@ -252,31 +220,54 @@
# Multiple DHCP clients:
#
# With two or more DHCP clients running, they would concurrently try to replace
-# the default route or rewrite resolv.conf, rewrite ntp.conf etc. There are two
-# ways of dealing with this conflict (and it is a conflict, because you can
-# have only one default route even though routes are stackable, and there can
-# only be one resolv.conf file):
+# the default route or set the hostname. There are several ways of dealing with
+# this conflict (and it is a conflict, because you can have only one default
+# route even though routes are stackable and the dhcp clients would change it
+# while every lease renew):
#
-# 1) allow both clients to do that stuff. This would work in many cases if
+# 1) Allow both clients to do that stuff. This would work in many cases if
# only one of the interfaces is used at a time. However, it would lead to
-# undefined behaviour.
+# undefined behaviour such as changing default route e.g. on dhcp renew.
#
-# 2) allow only one of the DHCP clients to do that stuff. This implies
-# that there would be a "primary" interface and a "secondary". This is the
-# assumption the default configuration is based on. But since the system
-# can't guess which interface is "more important" and should have the
-# default route and resolver configuration associated with it, it simply
-# chooses the first interface that is started with DHCP to be
-# "authoritative". Which one that is can be influenced by adding
-# DHCLIENT_PRIMARY_DEVICE=yes to one of the /etc/sysconfig/network/ifcfg-*
-# files. This can even be added to more than one file, to achieve the
-# behaviour described in 1). Thus, there is the flexibility to do it
-# either way.
-#
-# Per default, only the DHCP client that is started first will be allowed to
-# change the default route / resolver configuration etc. All other running
-# clients will only configure the interface with an address, but not change
-# "global" configuration.
+# 2) When both interfaces are connected to the same network, you may configure
+# a bonding interface in active-backup mode (or another, e.g. 802.3ad, when
+# supported and configured by the switch) and configure dhcp on the bonding
+# instead.
+#
+# 3) When only one of the interfaces is used at time, you may set STARTMODE to
+# ifplugd and specify the priority of the interfaces in IFPLUGD_PRIORITY.
+# This is a common scenario for notebooks to use the wired interface when
+# connected, wireless otherwise.
+#
+# 4) allow only one of the DHCP clients to do that stuff.
+# This implies that there would be a "primary" interface and a "secondary".
+# This is the assumption the default configuration is based on. But since
+# the system often can't guess which interface is "more important", we
+# simply choose one depending on related configuration or take the first
+# interface that is started with DHCP to be primary ("authoritative").
+# This can be configured by setting DHCLIENT_PRIMARY_DEVICE=yes in one of
+# the /etc/sysconfig/network/ifcfg-* files and DHCLIENT_PRIMARY_DEVICE=no
+# in /etc/sysconfig/network/dhcp (or in all other ifcfg files using DHCP).
+#
+# When DHCLIENT_PRIMARY_DEVICE is not explicitly configured to yes/no, the
+# "primary" interface is choosed as follows:
+#
+# - On systems with iSCSI Boot Firmare Table, the iBFT primary interface
+# is used as the primary DHCP interface by default.
+# - On systems booting via PXE, the interface specified by the BOOTIF kernel
+# parameter is used as primary DHCP interface. Set the global "ipappend 2"
+# parameter in pxelinux.cfg/* files, so the BOOTIF kernel parameter is set.
+# - Otherwise, the DHCP client that is started first will be "primary" and
+# allowed the set the default route and hostname ("first up wins" mode,
+# the only one before openSUSE 11.4). To force this "first up wins" mode,
+# set DHCLIENT_PRIMARY_DEVICE="first" in /etc/sysconfig/network/dhcp.
+#
+# All other running dhcp clients will only configure the interface with an
+# address and network routes, but not change the "global" default route or
+# hostname.
+# See also DHCLIENT_SET_DEFAULT_ROUTE and DHCLIENT_SET_HOSTNAME variables,
+# that allow to modify the DHCLIENT_PRIMARY_DEVICE parameter behaviour once
+# again.
#
# Thus, to specifically allow an interface's DHCP client to change "global"
# configuration, set the following variable to "yes". Or you can make an
@@ -285,17 +276,16 @@
#
DHCLIENT_PRIMARY_DEVICE=
-
## Type:
## Default:
#
-# Even more finegrained control can be excerted by setting any of the variables
-# from /etc/sysconfig/network/dhcp here:
+# Even more finegrained control can be excerted by setting any of the
+# variables from /etc/sysconfig/network/dhcp in ifcfg files:
+#
DHCLIENT_DEBUG=
DHCLIENT_SET_HOSTNAME=
DHCLIENT_SET_DEFAULT_ROUTE=
DHCLIENT_TIMEOUT=
-DHCLIENT_REBOOT_TIMEOUT=
DHCLIENT_CLIENT_ID=
DHCLIENT_HOSTNAME_OPTION=
DHCLIENT_VENDOR_CLASS_ID=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/sysconfig.dhcp-network new/sysconfig-0.74.3/config/sysconfig.dhcp-network
--- old/sysconfig-0.74.2/config/sysconfig.dhcp-network 2010-11-05 14:01:26.000000000 +0100
+++ new/sysconfig-0.74.3/config/sysconfig.dhcp-network 2011-01-06 10:45:47.000000000 +0100
@@ -72,6 +72,68 @@
#
DHCLIENT_DEBUG="no"
+## Type: list("",yes,no,first)
+## Default: ""
+#
+# Multiple DHCP clients:
+#
+# With two or more DHCP clients running, they would concurrently try to replace
+# the default route or set the hostname. There are several ways of dealing with
+# this conflict (and it is a conflict, because you can have only one default
+# route even though routes are stackable and the dhcp clients would change it
+# while every lease renew):
+#
+# 1) Allow both clients to do that stuff. This would work in many cases if
+# only one of the interfaces is used at a time. However, it would lead to
+# undefined behaviour such as changing default route e.g. on dhcp renew.
+#
+# 2) When both interfaces are connected to the same network, you may configure
+# a bonding interface in active-backup mode (or another, e.g. 802.3ad, when
+# supported and configured by the switch) and configure dhcp on the bonding
+# instead.
+#
+# 3) When only one of the interfaces is used at time, you may set STARTMODE to
+# ifplugd and specify the priority of the interfaces in IFPLUGD_PRIORITY.
+# This is a common scenario for notebooks to use the wired interface when
+# connected, wireless otherwise.
+#
+# 4) allow only one of the DHCP clients to do that stuff.
+# This implies that there would be a "primary" interface and a "secondary".
+# This is the assumption the default configuration is based on. But since
+# the system often can't guess which interface is "more important", we
+# simply choose one depending on related configuration or take the first
+# interface that is started with DHCP to be primary ("authoritative").
+# This can be configured by setting DHCLIENT_PRIMARY_DEVICE=yes in one of
+# the /etc/sysconfig/network/ifcfg-* files and DHCLIENT_PRIMARY_DEVICE=no
+# in /etc/sysconfig/network/dhcp (or in all other ifcfg files using DHCP).
+#
+# When DHCLIENT_PRIMARY_DEVICE is not explicitly configured to yes/no, the
+# "primary" interface is choosed as follows:
+#
+# - On systems with iSCSI Boot Firmare Table, the iBFT primary interface
+# is used as the primary DHCP interface by default.
+# - On systems booting via PXE, the interface specified by the BOOTIF kernel
+# parameter is used as primary DHCP interface. Set the global "ipappend 2"
+# parameter in pxelinux.cfg/* files, so the BOOTIF kernel parameter is set.
+# - Otherwise, the DHCP client that is started first will be "primary" and
+# allowed the set the default route and hostname ("first up wins" mode,
+# the only one before openSUSE 11.4). To force this "first up wins" mode,
+# set DHCLIENT_PRIMARY_DEVICE="first" in /etc/sysconfig/network/dhcp.
+#
+# All other running dhcp clients will only configure the interface with an
+# address and network routes, but not change the "global" default route or
+# hostname.
+# See also DHCLIENT_SET_DEFAULT_ROUTE and DHCLIENT_SET_HOSTNAME variables,
+# that allow to modify the DHCLIENT_PRIMARY_DEVICE parameter behaviour once
+# again.
+#
+# Thus, to specifically allow an interface's DHCP client to change "global"
+# configuration, set the following variable to "yes". Or you can make an
+# interface's DHCP client never change these settings if you set it to "no".
+# If you leave it empty then ifup-dhcp will decide.
+#
+DHCLIENT_PRIMARY_DEVICE=
+
## Type: yesno
## Default: no
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/doc/ifcfg-vlan.5 new/sysconfig-0.74.3/doc/ifcfg-vlan.5
--- old/sysconfig-0.74.2/doc/ifcfg-vlan.5 2010-01-21 16:39:40.000000000 +0100
+++ new/sysconfig-0.74.3/doc/ifcfg-vlan.5 2011-01-06 10:45:47.000000000 +0100
@@ -27,35 +27,41 @@
number at the end of the interface name is the VLAN ID.
Preferably the interface name and the configuration file follow the
-VLAN interface name scheme (type), that is either:
+VLAN interface name schemes (types), that is either:
.RS
.PD 0
.P
-ifcfg-\fBvlan\fR<\fBVLAN-ID\fR> (e.g. ifcfg-\fIvlan42\fR)
+ifcfg-\fBname\fR.<\fBVLAN-ID\fR> (e.g. ifcfg-\fIeth0.42\fR)
or
.P
-ifcfg-\fBname\fR.<\fBVLAN-ID\fR> (e.g. ifcfg-\fIeth0.42\fR)
+ifcfg-\fBvlan\fR<\fBVLAN-ID\fR> (e.g. ifcfg-\fIvlan42\fR)
.PD
.RE
+The ifcfg-\fBname\fR.<\fBVLAN-ID\fR> scheme is default on Linux.
+Note also, that the ifcfg-\fBvlan\fR<\fBVLAN-ID\fR> scheme makes
+it impossible to use same VLAN-ID on more than one interface
+(e.g. ifcfg-eth\fI0\fR.42 and ifcfg-eth\fI1\fR.42).
+
The VLAN-ID can be also 0-padded (e.g. ifcfg-vlan0042 or ifcfg-eth0.0042).
Also in case of custom names, trailing digits are interpreted as VLAN-ID
by default (e.g. ifcfg-dmz42). When \fBVLAN_ID\fR is set in the config,
-the interface name have any name (e.g. ifcfg-foobar).
+the interface name can have any name (e.g. ifcfg-foobar).
Note: The drawback of custom interface names and VLAN_ID usage is,
that a rename of the interface is required and that they violate
-the name scheme.
+the vlan name scheme.
.PP
The real interface will be set UP automatically and doesn't need a config
file in case of a physical interface. But without a config file YaST will
consider this interface as unused, if will not follow hotplug events and
-you're unable to apply any settings, e.g. ETHTOOL_OPTIONS. To avoid that,
-provide an config file with at least STARTMODE='auto'.
+you're unable to apply any settings, e.g. ETHTOOL_OPTIONS. To avoid these
+problems, it is strongly recommended to provide a config file with at
+least STARTMODE='auto' for the physical interface as well.
The rest of the VLAN interface IP and routes configuration do not differ
from ordinary interfaces. See also \fIman\ ifcfg\fR and \fIman\ routes\fR
@@ -63,9 +69,9 @@
.SH EXAMPLES
.TP
-Sets up \fIvlan3\fR vlan interface on top of \fBeth0\fR:
+Sets up \fIeth0.3\fR vlan interface on top of \fBeth0\fR:
-.I ifcfg-vlan3
+.I ifcfg-eth0.3
.nf
STARTMODE='auto'
ETHERDEVICE='\fBeth0\fR'
@@ -73,9 +79,9 @@
.fi
.TP
-Sets up \fIeth0.3\fR vlan interface on top of \fBeth0\fR:
+Sets up \fIvlan3\fR vlan interface on top of \fBeth0\fR:
-.I ifcfg-eth0.3
+.I ifcfg-vlan3
.nf
STARTMODE='auto'
ETHERDEVICE='\fBeth0\fR'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/missing new/sysconfig-0.74.3/missing
--- old/sysconfig-0.74.2/missing 2010-11-11 14:42:39.000000000 +0100
+++ new/sysconfig-0.74.3/missing 2011-01-06 10:46:02.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/scripts/functions new/sysconfig-0.74.3/scripts/functions
--- old/sysconfig-0.74.2/scripts/functions 2010-11-05 14:01:26.000000000 +0100
+++ new/sysconfig-0.74.3/scripts/functions 2011-01-06 10:45:47.000000000 +0100
@@ -273,7 +273,25 @@
}
get_hwaddress () {
- cat /sys/class/net/$1/address >/dev/null
+ cat /sys/class/net/$1/address 2>/dev/null
+}
+
+get_bonding_slave_hwaddrs()
+{
+ local ifname="${1}"
+ local saddrs=()
+ if test -f "/proc/net/bonding/$ifname" ; then
+ while read line ; do
+ case $line in
+ "Permanent HW addr:"*)
+ saddr+=("${line//Permanent HW addr: /}")
+ ;;
+ esac
+ done < "/proc/net/bonding/$ifname" 2>/dev/null
+ echo "${saddr[*]}"
+ return 0
+ fi
+ return 1
}
# This will echo the first address listed for the given interface.
@@ -820,3 +838,77 @@
return 1
}
+get_pxe_bootif_param()
+{
+ local cmdline=$(cat /proc/cmdline 2>/dev/null)
+ local rx='^(.*[[:space:]])?BOOTIF=([[:xdigit:]]{2}([-[:xdigit:]]{2})+)([[:space:]].*)?$'
+ if [[ ${cmdline} =~ ${rx} ]] ; then
+ echo "${BASH_REMATCH[2]}"
+ fi
+}
+
+is_pxe_boot_iface()
+{
+ # params <interface name>
+ # output 'yes': bootif param available, $1 interface match
+ # 'no' : bootif param available, no $1 interface match
+ # '' : otherwise (no bootif param, errors)
+ # returns 0 on success, 1 on errors
+ local bootif=`get_pxe_bootif_param 2>/dev/null`
+ test "x$bootif" = x && return 0
+
+ local ifname="$1"
+ test "x$ifname" != x -a -d "/sys/class/net/$ifname" || return 1
+ local iftype=`cat "/sys/class/net/$ifname/type" 2>/dev/null`
+ local ifaddr=`get_hwaddress "$ifname"`
+ test "x$iftype" != x -a "x$ifaddr" != x || return 1
+
+ local maddr=${bootif//-/:}
+ local addrs="$ifaddr" addr
+ case $iftype in
+ 1)
+ # TODO: bridge and vlan inherit hwaddrs as well
+ if test -d "/sys/class/net/$ifname/bonding" ; then
+ addrs=`get_bonding_slave_hwaddrs "$ifname" 2>/dev/null`
+ fi
+ ;;
+ esac
+ for addr in ${addrs} ; do
+ local x=`printf "%02x:%s" "$iftype" "$addr" 2>/dev/null`
+ if test "x$maddr" = "x$x" ; then
+ echo "yes"
+ return 0
+ fi
+ done
+ echo "no"
+}
+
+is_ibft_primary_iface()
+{
+ # params <interface name>
+ # output 'yes': ibft interfaces available, $1 interface is ibft primary
+ # 'no' : ibft interfaces available, $1 interface is not primary
+ # '' : otherwise (no ibft, errors)
+ # returns 0 on success, 1 on errors
+ case $1 in ""|.|..|*/*) return 1 ;; esac
+ test -d "/sys/class/net/$1" || return 1
+
+ local IF="$1" sysfs_ibft="/sys/firmware/ibft"
+ test -d "$sysfs_ibft" || return 1
+
+ # ibft ethernet0 is the primary ibft => dhcp primary
+ local ibft_nic0 enic edir="$sysfs_ibft/ethernet0"
+ if test -d "$edir" -a -d "$edir/device/net" ; then
+ for enic in `ls -1 $edir/device/net/ 2>/dev/null` ; do
+ test -d "$edir/device/net/$enic" || continue
+ ibft_nic0=$enic
+ break
+ done
+ fi
+
+ if test "x$ibft_nic0" != "x" ; then
+ test "x$ibft_nic0" = "x$IF" && echo yes || echo no
+ fi
+ return 0
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/scripts/ifup-dhcp new/sysconfig-0.74.3/scripts/ifup-dhcp
--- old/sysconfig-0.74.2/scripts/ifup-dhcp 2010-11-05 14:06:58.000000000 +0100
+++ new/sysconfig-0.74.3/scripts/ifup-dhcp 2011-01-06 10:45:47.000000000 +0100
@@ -502,21 +502,60 @@
# that is provided by the cached config data in a way that a user-defined
# DHCLIENT_PRIMARY_DEVICE remains untouched.
- if [ -z "$DHCLIENT_PRIMARY_DEVICE" ]; then
-
+ case $DHCLIENT_PRIMARY_DEVICE in
+ yes|no)
+ # -> explicit configuration, use as is
+ ;;
+ first|*)
# read cached config data into PRIMARY_FROM_CACHE
PRIMARY_FROM_CACHE="`grep_cached_config_data primary yes`"
if [ -z "$PRIMARY_FROM_CACHE" ]; then
- # no primary interface up-> we're the primary interface
- DHCLIENT_PRIMARY_DEVICE='yes'
- # save this fact to cached config data
- write_cached_config_data primary yes $INTERFACE
- commit_cached_config_data $INTERFACE
+ case $DHCLIENT_PRIMARY_DEVICE in
+ first)
+ # 'first' is to disable the ibft / pxe bootif checks
+ # and revert to use the old "first up wins" mode
+
+ # no primary interface up-> we're the primary interface
+ DHCLIENT_PRIMARY_DEVICE='yes'
+ ;;
+ *)
+ # check if ibft is available and whether this
+ # interface is the primary ibft interface
+ ibft_primary=`is_ibft_primary_iface $INTERFACE 2>/dev/null`
+ case $ibft_primary in
+ yes|no)
+ DHCLIENT_PRIMARY_DEVICE=$ibft_primary
+ ;;
+ *)
+ # check the BOOTIF PXE kernel parameter and
+ # set the primary flag when BOOTIF matches
+ # the interface or BOOTIF is not set at all
+ pxe_bootif=`is_pxe_boot_iface $INTERFACE 2>/dev/null`
+ if test "x$pxe_bootif" = xno ; then
+ # there is a BOOTIF param, but it
+ # does not match this interface
+ DHCLIENT_PRIMARY_DEVICE='no'
+ else
+ DHCLIENT_PRIMARY_DEVICE='yes'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+
+ if test "x$DHCLIENT_PRIMARY_DEVICE" != "xno" ; then
+ # OK, we are the primary
+ DHCLIENT_PRIMARY_DEVICE=yes
+
+ # save this fact to cached config data
+ write_cached_config_data primary yes $INTERFACE
+ commit_cached_config_data $INTERFACE
+ fi
else
# primary interface already up -> DHCLIENT_PRIMARY_DEVICE='no'
- if [ "${PRIMARY_FROM_CACHE% }" = $INTERFACE ]; then
+ if [ "${PRIMARY_FROM_CACHE// /}" = $INTERFACE ]; then
# special case for ifrenew:
# we are the primary interface which is up
DHCLIENT_PRIMARY_DEVICE='yes'
@@ -524,8 +563,8 @@
DHCLIENT_PRIMARY_DEVICE='no'
fi
fi
-
- fi
+ ;;
+ esac
DHCP4_STATUS=$R_NOTCONFIGURED
DHCP6_STATUS=$R_NOTCONFIGURED
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/scripts/link_wait new/sysconfig-0.74.3/scripts/link_wait
--- old/sysconfig-0.74.2/scripts/link_wait 2010-11-05 14:01:26.000000000 +0100
+++ new/sysconfig-0.74.3/scripts/link_wait 2011-01-06 10:45:47.000000000 +0100
@@ -21,7 +21,7 @@
#
usage () {
echo $@
- echo "usage: $SCRIPTNAME [<config>] <interface> [-o <options>]"
+ echo "usage: if-up.d/$SCRIPTNAME [<config>] <interface> [-o <options>]"
echo ""
echo "Options are:"
echo " [on]boot : we are currently booting (or shutting down)"
@@ -33,13 +33,16 @@
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=<steps>"
+ echo " - space separated list of steps to preform:"
+ echo " sleep: just sleep"
+ echo " check: check link state flags"
+ echo " ping : ping specified address"
+ echo " LINK_WAIT_SECS=<secs>"
+ echo " - seconds for each check/sleep/ping step"
+ echo " (limit is WAIT_FOR_INTERFACES for all)"
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 " - ping the specified address"
echo ""
echo "Install using:"
echo " ln -s ../scripts/link_wait /etc/sysconfig/network/if-up.d/"
@@ -59,7 +62,8 @@
# check arguments and how we are called (in case of links)
#
SCRIPTNAME=${0##*/}
-debug $*
+echo debug $*
+#set -x
case $1 in ""|-h|*help*) usage ;; esac
CONFIG="$1"
shift
@@ -93,6 +97,7 @@
# source interface config and make sure we use the
# per interface setting for wait for link check...
unset LINK_WAIT
+unset LINK_WAIT_SECS
unset LINK_WAIT_PING_IPV4
test -f ./ifcfg-$CONFIG && . ./ifcfg-$CONFIG || exit 0
@@ -119,72 +124,96 @@
test "$c" = "1" -a "$d" = "0" -a \
\( "$o" = "up" -o "$o" = "unknown" \) && return 0
else
- # SLE 10 does not have operstate/dormant
+ # e.g. SLE 10 does not have operstate/dormant
test "$c" = "1" && return 0
fi
}
-case $SCRIPTNAME in
+do_ping()
+{
+ local ifname=$1
+ local target=$2
+ local -i limit=$3
+ local -i ret=0
+ local beg now sec rest
+ IFS=. read beg rest < /proc/uptime
+ for ((now=$beg; $now < ($beg + $limit); )) ; do
+ sec=$(($limit - ($now - $beg)))
+ out=`ping -q -I $ifname -w $sec -c 1 $target 2>&1`
+ ret=$?
+ debug "$out"
+ test $ret -eq 0 && break
+ IFS=. read now rest < /proc/uptime
+ done
+ return $ret
+}
+
+case $0 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
+ # some compatibility to older version
+ if test "$LINK_WAIT" = yes ; then
+ LINK_WAIT=check
+ fi
+ if test -z "$LINK_WAIT_SECS" ; then
+ test $(( $LINK_WAIT )) -gt 0 && \
+ LINK_WAIT_SECS=$LINK_WAIT
+ case $LINK_WAIT_PING_IPV4 in
+ *\.*\.*\.*) LINK_WAIT="ping" ;;
+ *) LINK_WAIT="check" ;;
+ esac
+ fi
+
+ steps=($LINK_WAIT)
+ # don't wait more than WAIT_FOR_INTERFACES
+ if test ${#steps[@]} -gt 0 ; then
+ if test $(( $LINK_WAIT_SECS )) -eq 0 -o \
+ $(( $(($LINK_WAIT_SECS)) * ${#steps[@]} )) -gt \
+ $(( $WAIT_FOR_INTERFACES )) ; then
+ LINK_WAIT_SECS=$(( $WAIT_FOR_INTERFACES / ${#steps[@]} ))
+ fi
+ fi
+ spend=0
+ for step in ${steps[@]} ; do
+ case $step in
+ check)
+ declare -i secs=$LINK_WAIT_SECS
+ declare -i loop=0
+
+ 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 $secs && break
+ done
+
+ spend=$((spend + loop))
+ check_link_detected "$INTERFACE" \
+ && ifprint message "link detected after $spend secs" \
+ || ifprint message "no link detected ... continue"
+ ;;
+ sleep)
+ ifprint message "sleeping for $LINK_WAIT_SECS secs"
+ sleep $LINK_WAIT_SECS
+ spend=$((spend + LINK_WAIT_SECS))
+ ;;
+ ping)
+ case $LINK_WAIT_PING_IPV4 in
+ *\.*\.*\.*)
+ ifprint message "ping $LINK_WAIT_PING_IPV4 up to $LINK_WAIT_SECS secs"
+ if do_ping "$INTERFACE" "$LINK_WAIT_PING_IPV4" "$LINK_WAIT_SECS" ; then
+ ifprint message "ping reports reachable $LINK_WAIT_PING_IPV4"
+ else
+ ifprint message "ping reports unreachable $LINK_WAIT_PING_IPV4"
+ fi
+ spend=$((spend + LINK_WAIT_SECS))
+ ;;
+ esac
+ ;;
+ esac
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*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/sysconfig.spec new/sysconfig-0.74.3/sysconfig.spec
--- old/sysconfig-0.74.2/sysconfig.spec 2010-11-11 14:42:42.000000000 +0100
+++ new/sysconfig-0.74.3/sysconfig.spec 2011-01-06 10:46:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package sysconfig (Version 0.74.2)
+# spec file for package sysconfig (Version 0.74.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: sysconfig
-Version: 0.74.2
+Version: 0.74.3
Release: 0
Summary: The system configuration scheme
Url: http://gitorious.org/opensuse/sysconfig
@@ -27,6 +27,8 @@
License: GPLv2+
AutoReqProv: on
PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep
+# we may create these automatically from rpm later
+Provides: sysvinit(network)
Requires: iproute2 dbus-1 procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
@@ -100,7 +102,6 @@
%dir /etc/modprobe.d
%config /etc/sysconfig/network/ifcfg.template
%config /etc/modprobe.d/50-blacklist.conf
-%config(noreplace) /etc/modprobe.d/50-ipv6.conf
/etc/sysconfig/network/scripts/*
/etc/sysconfig/network/if-up.d/ndp-proxy
/etc/sysconfig/network/if-down.d/ndp-proxy
@@ -185,15 +186,6 @@
done
# erroneous move from network/dhcp to network/config while 11.1 beta
sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS
-#
-# * update to >= 11.2
-#
-# FIXME: use disable_ipv6
-# move ipv6 settings created by yast2-network before 11.2
-#
-if test -f etc/modprobe.d/ipv6 ; then
- mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf
-fi
%postun
%{insserv_cleanup}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/sysconfig.spec.in new/sysconfig-0.74.3/sysconfig.spec.in
--- old/sysconfig-0.74.2/sysconfig.spec.in 2010-11-05 14:01:26.000000000 +0100
+++ new/sysconfig-0.74.3/sysconfig.spec.in 2011-01-06 10:45:47.000000000 +0100
@@ -27,6 +27,8 @@
License: GPLv2+
AutoReqProv: on
PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep
+# we may create these automatically from rpm later
+Provides: sysvinit(network)
Requires: iproute2 dbus-1 procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
@@ -100,7 +102,6 @@
%dir /etc/modprobe.d
%config /etc/sysconfig/network/ifcfg.template
%config /etc/modprobe.d/50-blacklist.conf
-%config(noreplace) /etc/modprobe.d/50-ipv6.conf
/etc/sysconfig/network/scripts/*
/etc/sysconfig/network/if-up.d/ndp-proxy
/etc/sysconfig/network/if-down.d/ndp-proxy
@@ -185,15 +186,6 @@
done
# erroneous move from network/dhcp to network/config while 11.1 beta
sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS
-#
-# * update to >= 11.2
-#
-# FIXME: use disable_ipv6
-# move ipv6 settings created by yast2-network before 11.2
-#
-if test -f etc/modprobe.d/ipv6 ; then
- mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf
-fi
%postun
%{insserv_cleanup}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/VERSION new/sysconfig-0.74.3/VERSION
--- old/sysconfig-0.74.2/VERSION 2010-11-11 14:40:18.000000000 +0100
+++ new/sysconfig-0.74.3/VERSION 2011-01-06 10:45:47.000000000 +0100
@@ -1 +1 @@
-0.74.2
+0.74.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org