Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Tue Sep 6 14:49:10 CEST 2011.
-------- --- sysconfig/sysconfig.changes 2011-08-29 12:04:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2011-09-05 15:52:45.000000000 +0200 @@ -0,0 +1,18 @@ +------------------------------------------------------------------ +Mon Sep 5 09:07:58 UTC 2011 - m...@suse.com + +- version 0.75.1 +- Warn and ask the user to report a bug when the ifcfg defines the + INTERFACETYPE variable to override behaviour of ifup: There is a + bug in ifup when it is required to define it (bnc#711762). + Improved also variable description in ifcfg.5 manual page. +- Added missed dhcp4,dhcp6,ibft,none BOOTPROTO values to + ifcfg.template (bnc#701000). +- Added WIRELESS_AUTH_MODE='no-encryption' option handling to + ifup-wireless, because YaST sets it (bnc#648830). +- Fixed get_depending_ifaces to not return bonding slaves by + default as it is not required to stop the slaves before the + bonding master goes down and in fact it may cause a system + hang, when the slaves are infiniband child interfaces, that + are deleted while ifdown (bnc#698478). + calling whatdependson for head-i586 Old: ---- disable-NM-under-systemd.patch netconfig-dns-ranking-vpnc.patch sysconfig-0.75.0.tar.bz2 wireless-power-settings.patch New: ---- sysconfig-0.75.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.hVkBPr/_old 2011-09-06 14:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.hVkBPr/_new 2011-09-06 14:43:46.000000000 +0200 @@ -19,9 +19,9 @@ Name: sysconfig -Version: 0.75.0 -Release: 11 -Summary: The system configuration scheme +Version: 0.75.1 +Release: 1 +Summary: The sysconfig scheme and traditional network scripts Url: http://gitorious.org/opensuse/sysconfig Group: System/Base License: GPLv2+ @@ -32,9 +32,6 @@ Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 -Patch0: disable-NM-under-systemd.patch -Patch1: wireless-power-settings.patch -Patch2: netconfig-dns-ranking-vpnc.patch %description This package provides the SuSE system configuration scheme and @@ -54,9 +51,6 @@ %prep %setup -n sysconfig-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build autoreconf --force --install ++++++ sysconfig-0.75.0.tar.bz2 -> sysconfig-0.75.1.tar.bz2 ++++++ ++++ 2951 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.75.0/ChangeLog new/sysconfig-0.75.1/ChangeLog --- old/sysconfig-0.75.0/ChangeLog 2011-03-15 18:42:19.000000000 +0100 +++ new/sysconfig-0.75.1/ChangeLog 2011-09-05 15:51:20.000000000 +0200 @@ -1,4 +1,161 @@ -commit d49703aa84e0fa788cada73abb0e93ba2a9bcab0 (HEAD, master) +commit 42adafa3d1e6a30f9278470c2f66d966782a662f (HEAD, origin/master, test, master) +Author: Marius Tomaschewski <m...@suse.com> +Date: Mon Sep 5 15:46:58 2011 +0200 + + version 0.75.1, updated changes file + +commit cbd772566a74b3bb9f2199d9716c021a103a4d9e +Author: Frederic Crozat <fcro...@suse.com> +Date: Mon Aug 29 10:03:13 2011 +0000 + + Fixed incorrect systemd detection + +commit 640d8ec1a1bfeae7a8a3c26c65c5a5c2647c1f7b (master-test) +Author: Cristian Rodríguez <crrodrig...@opensuse.org> +Date: Wed Aug 10 03:05:20 2011 +0000 + + Do not use -fno-strict-aliasing when not needed + +commit da3529de3ab702f89399d374fc5c264bc33e021a +Author: Marius Tomaschewski <m...@suse.com> +Date: Fri Aug 26 22:02:59 2011 +0000 + + Added vpnc to DNS ranking as preferred service + +commit e2777a2da17fd8a53e70e050f21b7a9143281085 +Author: Frederic Crozat <fcro...@suse.com> +Date: Fri Aug 12 16:03:48 2011 +0200 + + Do not handle NetworkManager if running under systemd. + + NetworkManager should be using its own .service when used under + systemd. + +commit d68d274585064a892d1dbe042c42737ef36f1ae9 +Author: Marius Tomaschewski <m...@suse.de> +Date: Thu Aug 11 14:11:52 2011 +0200 + + Show warning when ifcfg file defines INTERFACETYPE + + Warn and ask the user to report a bug when the ifcfg defines + the INTERFACETYPE to override behaviour of ifup: There is a + bug in ifup when it is required to define it (bnc#711762). + Improved also variable description in ifcfg.5 manual page. + +commit 9ae8db79d5613aa7458f88451da29f7c39365b7c +Author: Marius Tomaschewski <m...@suse.de> +Date: Thu Jun 9 09:50:20 2011 +0200 + + Use summary as in pdb + +commit abaca4f91d6b6e10c5d47c30ff866ae452d210d4 +Author: Marius Tomaschewski <m...@suse.de> +Date: Tue Jun 7 17:18:59 2011 +0200 + + Do not return bonding slaves in get_depending_ifaces + + Fixed get_depending_ifaces to not return bonding slaves by + default as it is not required to stop the slaves before the + bonding master goes down and in fact it may cause a system + hang, when the slaves are infiniband child interfaces, that + are deleted while ifdown (bnc#698478). + +commit fd3f9c52cfe68091e81d307980e30e2abedb3e5e (export/master) +Author: Marius Tomaschewski <m...@suse.de> +Date: Mon Jun 27 10:05:07 2011 +0200 + + Added ibft,node to the meta list, not only comment + +commit ea6e6c62fdba32ff0f1157f50deb1f710df70e58 (backup/master) +Author: Marius Tomaschewski <m...@suse.de> +Date: Mon Jun 27 09:39:49 2011 +0200 + + Added ibft,none to BOOTPROTO in ifcfg.template + + Added also ibft,none to yast2 meta tag value list of the BOOTPROTO + variable in /etc/sysconfig/network/ifcfg.template (bnc#701000). + +commit dd2cdefd213933b644009681fb9c035dedcfee52 +Author: Michal Kubeček <mkube...@novell.com> +Date: Mon Jun 20 15:52:12 2011 +0000 + + Added dhcp4,dhcp6 to BOOTPROTO in ifcfg.template + + Added dhcp4,dhcp6 to yast2 meta tag value list of the BOOTPROTO + variable in /etc/sysconfig/network/ifcfg.template (bnc#701000). + +commit b54c65525c0577b87f2ed8f3343e5993655d5a5d +Author: Vladimir Botka <vbo...@suse.de> +Date: Wed Jun 8 22:00:08 2011 +0200 + + no-encryption option added to the WIRELESS_AUTH_MODE + + (bnc#213001) introduced no-encryption option in Yast, but this option has + never been implemented in the sysconfig. The differnece between no-encryption + and open is that open system can use user authentication. In both cases + key_mgmt=NONE option shall be put into the wpa_supplicant.conf (bnc#648830). + + Signed-off-by: Marius Tomaschewski <m...@suse.de> + +commit 7e68aac4fba2270a3d08ab991bbd5de5b6ade0d3 +Author: Ludwig Nussel <ludwig.nus...@suse.de> +Date: Tue May 31 17:14:43 2011 +0200 + + remove /var/lock/subsys references + + Signed-off-by: Marius Tomaschewski <m...@suse.de> + +commit ffc50234f05b556c0050f9dcd3ce52840921e1d1 +Author: Marius Tomaschewski <m...@suse.de> +Date: Fri May 20 22:54:39 2011 +0200 + + Removed 127.0.0.2 workaround from ifcfg-lo + + Dropped address used by WRITE_HOSTNAME_TO_HOSTS (fate#308824). + +commit 9beeb884d295eb101175b11591a5459a46aad124 +Author: Ludwig Nussel <ludwig.nus...@suse.de> +Date: Fri May 20 14:37:11 2011 +0200 + + change WRITE_HOSTNAME_TO_HOSTS to "no" (fate#308824) + +commit 9c43872a6dd80f1a5a1b39cdb10b600f627dc913 +Author: Marius Tomaschewski <m...@suse.de> +Date: Thu May 12 09:49:43 2011 +0200 + + Apply wireless power settings when requested + + Fixed to apply wireless power settings and allow any setting as + defined in the iwconfig(8) manual page (fate#309255). + +commit e8651abcec16c48cded3e25b088249b5fe15711d +Author: Marius Tomaschewski <m...@suse.de> +Date: Tue May 3 10:42:18 2011 +0200 + + Fixed ifsysctl examples to use use_tempaddr = 2 + + Fixed example to use use_tempaddr = 2 (enable Privacy Extensions + and prefer temporary addresses over public addresses) instead of + use_tempaddr = 1 (enable Privacy Extensions, but prefer public + addresses over temporary addresses), so it causes the expected + effects (bnc#664550). + +commit 536459aa5d42a10ff4069b291cf94e70cdd44e1a +Author: Marius Tomaschewski <m...@suse.de> +Date: Mon Apr 18 14:17:13 2011 +0000 + + Improved bonding slave documentation + +commit 72e650470608229be41fd30e39e56acb9eafbd53 +Author: Marius Tomaschewski <m...@suse.de> +Date: Mon Mar 28 12:23:10 2011 +0200 + + netconfig/dns: ignore forwarders matching own IPs + + Filter out all misconfigured dns forwarder IPs, that match an + own IP as they would cause a loop (bnc#676676). + +commit d49703aa84e0fa788cada73abb0e93ba2a9bcab0 Author: Marius Tomaschewski <m...@suse.de> Date: Tue Mar 15 18:41:42 2011 +0100 @@ -46,7 +203,7 @@ ifservices: updated obsolete eth-id example. -commit 2a14007b7ff5dd3cfe056c53f29f1e06ca4e5de2 (origin/opensuse-11.4, origin/master, export/opensuse-11.4, export/master, opensuse-11.4) +commit 2a14007b7ff5dd3cfe056c53f29f1e06ca4e5de2 (tag: opensuse-11.4-release) Author: Marius Tomaschewski <m...@suse.de> Date: Mon Feb 14 14:58:48 2011 +0100 @@ -62,7 +219,7 @@ become world readable while installation because of a fillup run; changed to explicitly set 0600 permissions (bnc#670871). -commit 2d2bd368534b2fa0d5507101631d6a56368e296b +commit 2d2bd368534b2fa0d5507101631d6a56368e296b (tag: version-0.74.5) Author: Marius Tomaschewski <m...@suse.de> Date: Tue Jan 25 09:57:13 2011 +0100 @@ -93,7 +250,7 @@ Fixed typo in doc/ifcfg.5, IPv4 autoip, not IPv6 -commit 5f27fe28321497c64358e2e052e36f40952d56a9 +commit 5f27fe28321497c64358e2e052e36f40952d56a9 (tag: version-0.74.4) Author: Marius Tomaschewski <m...@suse.de> Date: Fri Jan 7 17:32:27 2011 +0100 @@ -123,7 +280,7 @@ Fixed ifup-bonding to not fail on enslave errors, but at the end, when there are no slaves in the bond (bnc#660774). -commit e38938065e356e5b96ee42ea616c1796037fd89b +commit e38938065e356e5b96ee42ea616c1796037fd89b (tag: version-0.74.3) Author: Marius Tomaschewski <m...@suse.de> Date: Wed Jan 5 16:58:56 2011 +0100 @@ -181,7 +338,7 @@ Fixed link_wait scriptname check and ping usage (bnc#644738); improved to allow the user to specify the steps. -commit 7cda3f6f76b177f2cbc3aa91e84fffbba2508ffa +commit 7cda3f6f76b177f2cbc3aa91e84fffbba2508ffa (tag: version-0.74.2) Author: Marius Tomaschewski <m...@suse.de> Date: Thu Nov 11 14:42:03 2010 +0100 @@ -224,7 +381,7 @@ require wpa_supplicant if a wpa_supplicant config is specified -commit 17537e86e6671419a3d059d788673940cac64451 (test) +commit 17537e86e6671419a3d059d788673940cac64451 Author: Marius Tomaschewski <m...@suse.de> Date: Wed Oct 6 11:43:57 2010 +0200 @@ -912,7 +1069,7 @@ git-svn-id: https://svn.suse.de/svn/sysconfig/trunk@2087 bf393798-0adf-0310-9952-bd479070b6c1 -commit 6c2a678fa6a64ab7210624390294e5acc689009a (netconfig-empty-defaults) +commit 6c2a678fa6a64ab7210624390294e5acc689009a Author: mt <mt@bf393798-0adf-0310-9952-bd479070b6c1> Date: Thu Jan 14 15:03:18 2010 +0000 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.75.0/VERSION new/sysconfig-0.75.1/VERSION --- old/sysconfig-0.75.0/VERSION 2011-03-15 18:05:03.000000000 +0100 +++ new/sysconfig-0.75.1/VERSION 2011-09-05 15:47:23.000000000 +0200 @@ -1 +1 @@ -0.75.0 +0.75.1 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.75.0/config/ifcfg-lo new/sysconfig-0.75.1/config/ifcfg-lo --- old/sysconfig-0.75.0/config/ifcfg-lo 2011-03-15 17:49:47.000000000 +0100 +++ new/sysconfig-0.75.1/config/ifcfg-lo 2011-09-05 14:21:22.000000000 +0200 @@ -3,7 +3,6 @@ NETMASK=255.0.0.0 NETWORK=127.0.0.0 BROADCAST=127.255.255.255 -IPADDR_2=127.0.0.2/8 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.75.0/config/ifcfg.template new/sysconfig-0.75.1/config/ifcfg.template --- old/sysconfig-0.75.0/config/ifcfg.template 2011-03-15 17:49:47.000000000 +0100 +++ new/sysconfig-0.75.1/config/ifcfg.template 2011-09-05 10:27:48.000000000 +0200 @@ -39,15 +39,19 @@ # IFPLUGD_PRIORITY= -## Type: list(static,dhcp,autoip,dhcp+autoip,6to4) +## Type: list(static,dhcp,dhcp4,dhcp6,autoip,dhcp+autoip,6to4,ibft,none) ## Default: static # # With BOOTPROTO you can choose in which mode the interface will be set up: # - static: Set up static address(es) -# - dhcp: Start a dhcp client on that interface. +# - dhcp: Start a dhcp client (IPV4 and IPv6) on that interface. +# - dhcp4: Start a dhcp client (IPv4 only) on that interface. +# - dhcp6: Start a dhcp client (IPv6 only) on that interface. # - autoip: Automatic search for a free address and assign it statically. -# - dhcp+autoip: Try dhcp and use autoip if dhcp fails. +# - dhcp+autoip: Try dhcp4 and use autoip if dhcp fails. # - 6to4: Set up ipv6 over ipv4 tunnel (see man ifcfg-tunnel) +# - ibft: Use iSCSI Boot Firmware Table (iBFT) +# - none: Do not set up the link or ip, a (bonding) master will do it. # If you use dhcp or autoip you may additionally specify static address(es). # BOOTPROTO= @@ -612,16 +616,21 @@ # Ad-Hoc modes when the variable is empty. WIRELESS_AP='' -## Type: string(yes,no,none) +## Type: string(yes,no,none,) ## Default: "none" # -# Can be set to yes, no, none (default). -# If set to none, ifup will not manipulate power saving for this device. -# If set to no, ifup tries to disable power saving for this device. -# If set to yes, ifup tries to enable power saving for this device. This -# is not supported by all cards resp. drivers and shall be tested before -# the user decides to set it. -WIRELESS_POWER='none' +# Used to manipulate power management scheme parameters and mode. +# Can be set to 'yes', 'no', 'none' or '' (default) or to any setting that +# is defined in iwconfig(8) manual page as value for the power option. +# +# If set to "" or "none", ifup will not manipulate power saving for this device. +# If set to "no", ifup tries to disable the power saving for this device. +# If set to "yes", ifup tries to enable power saving for this device. +# Other settings are passed directly to the iwconfig power command. +# +# Note, that this setting is not supported by all cards resp. drivers +# and shall be tested before the user decides to set it. +WIRELESS_POWER='' ## Type: string ## Default: "" 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.75.0/config/sysconfig.dhcp-network new/sysconfig-0.75.1/config/sysconfig.dhcp-network --- old/sysconfig-0.75.0/config/sysconfig.dhcp-network 2011-03-15 17:49:47.000000000 +0100 +++ new/sysconfig-0.75.1/config/sysconfig.dhcp-network 2011-09-05 14:21:22.000000000 +0200 @@ -276,7 +276,7 @@ DHCLIENT_WAIT_AT_BOOT="15" ## Type: yesno -## Default: yes +## Default: no ## ServiceRestart: yast2 # # This option is read by YaST during network configuration. @@ -286,5 +286,5 @@ # host to be reached), if the real network is not reachable. # # If unset, YaST will not touch /etc/hosts. -WRITE_HOSTNAME_TO_HOSTS="yes" +WRITE_HOSTNAME_TO_HOSTS="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.75.0/doc/ifcfg-bonding.5 new/sysconfig-0.75.1/doc/ifcfg-bonding.5 --- old/sysconfig-0.75.0/doc/ifcfg-bonding.5 2010-11-16 13:37:09.000000000 +0100 +++ new/sysconfig-0.75.1/doc/ifcfg-bonding.5 2011-06-09 17:47:12.000000000 +0200 @@ -19,6 +19,20 @@ .TP .B BONDING_SLAVE_<X> here you specify the interface name representing the slave network interfaces. + +\fBNote\fR: +Please adopt the /etc/udev/rules.d/70-persistent-net.rules rule file to match +the hardware by BUS id and not by the MAC address (default). Using MAC address, +it is not possible to replace a defect NIC with a new one (having a different +MAC), without to adopt either the MAC or the name of the slave interface in the +configuration files. +.br +Note also: Bonding slave interfaces are reserved for the bonding and are not +usable for any another purposes (unlike e.g. interfaces used for VLANs) and +the bonding master manages the slaves itself, e.g. it sets the MAC address +on the slaves. To configure this accordingly, set BOOTPROTO=none in the ifcfg +file of each slave interfaces to avoids any link-layer or IP setup on these +interfaces. .TP .B BONDING_MODULE_OPTS contains bonding options. Here you can set interface timeouts or working modes @@ -47,13 +61,26 @@ STARTMODE='onboot' BOOTPROTO='static' IPADDR='192.168.0.1/24' - BONDING_MASTER='yes' BONDING_SLAVE_0='eth0' BONDING_SLAVE_1='eth1' BONDING_MODULE_OPTS='mode=active-backup miimon=100' .fi +.I ifcfg-eth0 +.nf + STARTMODE='onboot' + BOOTPROTO='none' + #ETHTOOL_OPTIONS='wol g' +.fi + +.I ifcfg-eth1 +.nf + STARTMODE='onboot' + BOOTPROTO='none' + #ETHTOOL_OPTIONS='wol g' +.fi + .SH Additional Information For additional and more general information take a look into 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.75.0/doc/ifcfg.5 new/sysconfig-0.75.1/doc/ifcfg.5 --- old/sysconfig-0.75.0/doc/ifcfg.5 2011-03-15 17:56:20.000000000 +0100 +++ new/sysconfig-0.75.1/doc/ifcfg.5 2011-09-05 11:04:30.000000000 +0200 @@ -241,8 +241,11 @@ .B ip link set up ... .TP .B INTERFACETYPE -Sometimes ifup cannot determine the interface type properly. In this cases you -may specify it in this variable. +In case ifup cannot determine the interface type properly, you may +specify the correct type in this variable to override the behavior +and force ifup to handle the interface differently than it detected +from system or config. +Please always open a bug report when it is required to set the type. .TP .B ETHTOOL_OPTIONS If this variable is not empty ifup will call ethtool with this options. 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.75.0/doc/ifsysctl.5 new/sysconfig-0.75.1/doc/ifsysctl.5 --- old/sysconfig-0.75.0/doc/ifsysctl.5 2011-03-15 18:02:24.000000000 +0100 +++ new/sysconfig-0.75.1/doc/ifsysctl.5 2011-09-05 14:21:22.000000000 +0200 @@ -14,7 +14,7 @@ usually interface specific settings, like: .nf - net.ipv6.conf.eth0.use_tempaddr = 1 + net.ipv6.conf.eth0.use_tempaddr = 2 or net.ipv4.conf.eth0.rp_filter = 0 .fi @@ -64,21 +64,21 @@ Settings for "eth0" and "eth0.1" interfaces .nf # using "." as separator: - net.ipv6.conf.eth0.use_tempaddr = 1 - net.ipv6.conf.eth0/1.use_tempaddr = 1 + net.ipv6.conf.eth0.use_tempaddr = 2 + net.ipv6.conf.eth0/1.use_tempaddr = 2 # using "/" as separator: - net/ipv6/conf/eth0/use_tempaddr = 1 - net/ipv6/conf/eth0.0/use_tempaddr = 1 + net/ipv6/conf/eth0/use_tempaddr = 2 + net/ipv6/conf/eth0.0/use_tempaddr = 2 .fi Settings with variables: .nf # using "." as separator: - net.ipv6.conf.$SYSCTL_IF.use_tempaddr = 1 + net.ipv6.conf.$SYSCTL_IF.use_tempaddr = 2 # using "/" as separator: - net/ipv6/conf/$INTERFACE/use_tempaddr = 1 + net/ipv6/conf/$INTERFACE/use_tempaddr = 2 .fi To test your ifsysctl-eth0 or ifsysctl file, use: 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.75.0/doc/netconfig.8 new/sysconfig-0.75.1/doc/netconfig.8 --- old/sysconfig-0.75.0/doc/netconfig.8 2010-11-16 13:37:09.000000000 +0100 +++ new/sysconfig-0.75.1/doc/netconfig.8 2011-09-05 14:21:22.000000000 +0200 @@ -230,7 +230,7 @@ The special default value \fI"auto"\fR enables the build-in service ranking list, currently: .nf - "+strongswan +openswan +racoon +openvpn -avahi" + "+strongswan +openswan +racoon +openvpn +vpnc -avahi" .fi the value \fI"none"\fR or \fI""\fR allows to disable the ranking / sorting. 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.75.0/scripts/functions new/sysconfig-0.75.1/scripts/functions --- old/sysconfig-0.75.0/scripts/functions 2011-03-15 17:55:55.000000000 +0100 +++ new/sysconfig-0.75.1/scripts/functions 2011-09-05 14:21:22.000000000 +0200 @@ -582,14 +582,24 @@ # This function looks for interfaces which depend on the given interface. It # prints a list with all depending interfaces. It returns 0 if there are # depending interfaces and !=0 if not. -# Currently it checks only for vlan and bonding interfaces. +# Currently it checks only for vlan and optionally bonding slave interfaces. # FIXME: Add other types of interfaces that depend on others. get_depending_ifaces() { - local VLAN_PATH BOND_PATH DEP_IFACES DEP_VLANS DEP_BONDS BASE_IFACE i + local VLAN_PATH BOND_PATH DEP_VLANS DEP_BONDS BASE_IFACE i + local -a DEP_IFACES=() VLAN_PATH="/proc/net/vlan" - BOND_PATH="/proc/net/bonding" + BOND_PATH="" + while [ $# -gt 0 ]; do + case $1 in + --with-bonding-slaves) + BOND_PATH="/proc/net/bonding" + shift + ;; + -*) shift ;; + *) break ;; + esac + done BASE_IFACE="$1" - DEP_IFACES="" if [ -z "$BASE_IFACE" ]; then return 1 @@ -598,14 +608,14 @@ if [ -d "$VLAN_PATH" ]; then DEP_VLANS=`cd "$VLAN_PATH" grep -lws "Device: *$BASE_IFACE" *` - DEP_IFACES="$DEP_VLANS" + DEP_IFACES+=($DEP_VLANS) fi - if [ -d "$BOND_PATH" ]; then + if [ -n "$BOND_PATH" -a -d "$BOND_PATH" ]; then DEP_BONDS=`cd "$BOND_PATH" grep -s '^Slave Interface:' $BASE_IFACE | while IFS=':' read text iface ; do echo -n "$iface" ; done` - DEP_IFACES="$DEP_IFACES${DEP_BONDS:+ $DEP_BONDS}" + DEP_IFACES+=($DEP_BONDS) fi case $BASE_IFACE in @@ -614,18 +624,18 @@ for i in `ls -1 /sys/class/net/ 2>/dev/null` ; do test -d /sys/class/net/$i || continue case $i in (${BASE_IFACE}.*) - DEP_IFACES="${DEP_IFACES}${i:+ $i}" + DEP_IFACES+=($i) ;; esac done ;; esac - if [ -z "$DEP_IFACES" ]; then - return 1 - else - echo "$DEP_IFACES" + if [ ${#DEP_IFACES[*]} -gt 0 ]; then + echo "${DEP_IFACES[*]}" return 0 + else + return 1 fi } 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.75.0/scripts/functions.netconfig new/sysconfig-0.75.1/scripts/functions.netconfig --- old/sysconfig-0.75.0/scripts/functions.netconfig 2011-03-15 17:49:47.000000000 +0100 +++ new/sysconfig-0.75.1/scripts/functions.netconfig 2011-09-05 14:21:22.000000000 +0200 @@ -22,7 +22,7 @@ r=$ROOT # builtin dns ranking defaults -NETCONFIG_DNS_RANKING_DEFAULT="+strongswan +openswan +racoon +openvpn -avahi" +NETCONFIG_DNS_RANKING_DEFAULT="+strongswan +openswan +racoon +openvpn +vpnc -avahi" test -z "$MD5DIR" && { MD5DIR=$r/var/adm/netconfig/md5 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.75.0/scripts/ifup new/sysconfig-0.75.1/scripts/ifup --- old/sysconfig-0.75.0/scripts/ifup 2011-03-15 17:56:20.000000000 +0100 +++ new/sysconfig-0.75.1/scripts/ifup 2011-09-05 14:21:22.000000000 +0200 @@ -173,7 +173,9 @@ ###################################################################### # Find out the type of the interface # This may be overwritten in the configuration file +# in cases the detection fails. # +unset INTERFACETYPE test -z "$INTERFACETYPE" && INTERFACETYPE=`get_iface_type $INTERFACE` test -z "$INTERFACETYPE" && INTERFACETYPE=`get_iface_type_from_config $INTERFACE` # at least ifup-wireless needs $INTERFACETYPE, so we have to export it @@ -225,13 +227,33 @@ ###################################################################### # Now source the configuration file and check if we have an interface # +declare -r _INTERFACETYPE="$INTERFACETYPE" +INTERFACETYPE="" if [ -n "$CONFIG" -a -r ifcfg-$CONFIG ] ; then . ifcfg-$CONFIG + + # Complain when INTERFACETYPE is set in the config + # and ask the user to report a bug as it should be + # used only when detection fails, _not_ by default. + if test "X$INTERFACETYPE" != "X" ; then + IM=`printf " %-9s" $INTERFACE` + BM=`printf " %-9s" "" " Please open a bug report."` + if test "X$INTERFACETYPE" = "X$_INTERFACETYPE" ; then + logerror "$IM Warning: ifcfg-$CONFIG"\ + "overrides interface type detection.\n$BM" + else + logerror "$IM Warning: ifcfg-$CONFIG"\ + "modifies interface type from"\ + "'$_INTERFACETYPE' to '$INTERFACETYPE'.\n$BM" + fi + fi + # Store config name persistently for use in ifplugd-selectif after # interface has gone. Without that info it will not activate # alternative interface in this case. Used in get_ifplugd_priority() echo $CONFIG > $RUN_FILES_BASE/config-$INTERFACE fi +test "X$INTERFACETYPE" = "X" && export INTERFACETYPE="$_INTERFACETYPE" ###################################################################### # Check if the interface is available 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.75.0/scripts/ifup-wireless new/sysconfig-0.75.1/scripts/ifup-wireless --- old/sysconfig-0.75.0/scripts/ifup-wireless 2011-03-15 17:49:47.000000000 +0100 +++ new/sysconfig-0.75.1/scripts/ifup-wireless 2011-09-05 14:00:47.000000000 +0200 @@ -304,7 +304,7 @@ # special hack for madwifi test "$DRIVER" = "ath_pci" && run_iw_tool priv authmode 2 ;; - open|opensystem|"") WIRELESS_SEC_MODE="open";; + open|opensystem|no-encryption|"") WIRELESS_SEC_MODE="open";; esac fi if [ -n "$WIRELESS_KEY_0" -a \ @@ -403,7 +403,7 @@ wlanctl dot11req_mibset mibattribute=dot11ExcludeUnencrypted=true AUTHTYPE=sharedkey ;; - open|opensystem|"") + open|opensystem|no-encryption|"") wlanctl dot11req_mibset mibattribute=dot11ExcludeUnencrypted=false AUTHTYPE=opensystem ;; @@ -540,7 +540,7 @@ print_network_line ssid WIRELESS_ESSID "$SUFFIX" print_network_line_unquoted priority WIRELESS_PRIORITY "$SUFFIX" case "`eval echo \\$WIRELESS_AUTH_MODE$SUFFIX`" in - open) + open|no-encryption) echo " key_mgmt=NONE" for i in 0 1 2 3 ; do KEY="`eval print_key \\"\\$WIRELESS_KEY_$i$SUFFIX\\" \\$WIRELESS_KEY_LENGTH$SUFFIX`" @@ -776,6 +776,14 @@ PREFER_WPA_SUPPLICANT=no ;; esac + + case $WIRELESS_POWER in + ""|none) ;; + yes) run_iw_tool config power period 2 ;; + no) run_iw_tool config power off ;; + *) run_iw_tool config power $WIRELESS_POWER ;; + esac + if need_wpa_supplicant ; then info_mesg "configuration requires wpa_supplicant" set_default_wpa_driver 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.75.0/scripts/netconfig.d/dns-bind new/sysconfig-0.75.1/scripts/netconfig.d/dns-bind --- old/sysconfig-0.75.0/scripts/netconfig.d/dns-bind 2010-11-16 13:37:09.000000000 +0100 +++ new/sysconfig-0.75.1/scripts/netconfig.d/dns-bind 2011-06-10 14:57:11.000000000 +0200 @@ -240,7 +240,9 @@ DNS_SERVERS_2="$DNS_SERVERS_2 $NETCONFIG_DNS_STATIC_SERVERS" fi -# filter out loopback addresses that would case a loop +# filter out loopback addresses and all own IPs that would case a loop +own_ips=(`ip addr show 2>/dev/null | \ +LANG=C LC_ALL=C gawk '/[ ]+(inet|inet6)[ ]+/ { sub("/.*","",$2); print $2; }' 2>/dev/null`) for idx in 0 1 2 ; do var="DNS_SERVERS_$idx" val=(${!var}) @@ -248,7 +250,13 @@ for ns in ${val[@]} ; do case $ns in 127.*|::1) ;; - *) new+=("$ns") ;; + *) + for ip in "${own_ips[@]}" ; do + test "x$ip" = "x" && continue + test "x$ip" = "x$ns" && continue 2 + done + new+=("$ns") + ;; esac done eval "${var}='${new[@]}'" 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.75.0/scripts/netconfig.d/dns-dnsmasq new/sysconfig-0.75.1/scripts/netconfig.d/dns-dnsmasq --- old/sysconfig-0.75.0/scripts/netconfig.d/dns-dnsmasq 2010-11-16 13:37:09.000000000 +0100 +++ new/sysconfig-0.75.1/scripts/netconfig.d/dns-dnsmasq 2011-06-10 14:57:11.000000000 +0200 @@ -242,7 +242,9 @@ DNS_SERVERS_2="$DNS_SERVERS_2 $NETCONFIG_DNS_STATIC_SERVERS" fi -# filter out loopback addresses that would case a loop +# filter out loopback addresses and all own IPs that would case a loop +own_ips=(`ip addr show 2>/dev/null | \ +LANG=C LC_ALL=C gawk '/[ ]+(inet|inet6)[ ]+/ { sub("/.*","",$2); print $2; }' 2>/dev/null`) for idx in 0 1 2 ; do var="DNS_SERVERS_$idx" val=(${!var}) @@ -250,7 +252,13 @@ for ns in ${val[@]} ; do case $ns in 127.*|::1) ;; - *) new+=("$ns") ;; + *) + for ip in "${own_ips[@]}" ; do + test "x$ip" = "x" && continue + test "x$ip" = "x$ns" && continue 2 + done + new+=("$ns") + ;; esac done eval "${var}='${new[@]}'" 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.75.0/scripts/network new/sysconfig-0.75.1/scripts/network --- old/sysconfig-0.75.0/scripts/network 2011-03-15 17:49:47.000000000 +0100 +++ new/sysconfig-0.75.1/scripts/network 2011-09-05 14:21:22.000000000 +0200 @@ -102,6 +102,15 @@ || exit $R_INTERNAL +systemd_running () { +# We simply test whether systemd cgroup hierarchy is mounted + if /bin/mountpoint -q /sys/fs/cgroup/systemd ; then + return 1 + fi + return 0 +} + + ###################################################################### # Start NetworkManager if wanted # @@ -110,9 +119,12 @@ # because they are also used in ifup # if [ "$NETWORKMANAGER" = yes ] ; then - if [ "$FS_FILTER" = "localfs" ] ; then + systemd_running ; sd=$? + if [ "$FS_FILTER" = "localfs" -o $sd = 1 ] ; then # NetworkManager is not supported without remotefs # and will be started later via network-remotefs. + # NetworkManager should be started with its own .service + # under systemd case $ACTION in (status) exit 3 ;; (start) exit 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.75.0/sysconfig.spec new/sysconfig-0.75.1/sysconfig.spec --- old/sysconfig-0.75.0/sysconfig.spec 2011-03-15 18:42:08.000000000 +0100 +++ new/sysconfig-0.75.1/sysconfig.spec 2011-09-05 15:49:35.000000000 +0200 @@ -19,9 +19,9 @@ Name: sysconfig -Version: 0.75.0 +Version: 0.75.1 Release: 0 -Summary: The system configuration scheme +Summary: The sysconfig scheme and traditional network scripts Url: http://gitorious.org/opensuse/sysconfig Group: System/Base License: GPLv2+ @@ -54,7 +54,7 @@ %build autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC" \ ./configure --prefix=/ \ --sbindir=/sbin \ --libdir=/%_lib \ @@ -72,8 +72,6 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -# This directory is not used since some time (was used for ifup locking) -mkdir -p $RPM_BUILD_ROOT/var/lock/subsys/sysconfig touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp # install udevmountd @@ -113,7 +111,6 @@ /usr/share/omc/svcinfo.d/network.xml /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-network -%dir /var/lock/subsys/sysconfig %pre # package update ? 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.75.0/sysconfig.spec.in new/sysconfig-0.75.1/sysconfig.spec.in --- old/sysconfig-0.75.0/sysconfig.spec.in 2011-03-15 18:37:23.000000000 +0100 +++ new/sysconfig-0.75.1/sysconfig.spec.in 2011-09-05 14:21:22.000000000 +0200 @@ -21,7 +21,7 @@ Name: sysconfig Version: @VERSION@ Release: 0 -Summary: The system configuration scheme +Summary: The sysconfig scheme and traditional network scripts Url: http://gitorious.org/opensuse/sysconfig Group: System/Base License: GPLv2+ @@ -54,7 +54,7 @@ %build autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC" \ ./configure --prefix=/ \ --sbindir=/sbin \ --libdir=/%_lib \ @@ -72,8 +72,6 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -# This directory is not used since some time (was used for ifup locking) -mkdir -p $RPM_BUILD_ROOT/var/lock/subsys/sysconfig touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp # install udevmountd @@ -113,7 +111,6 @@ /usr/share/omc/svcinfo.d/network.xml /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-network -%dir /var/lock/subsys/sysconfig %pre # package update ? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
