commit sysconfig for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package sysconfig for
openSUSE:12.1:Update:Test checked in at 2012-03-23 14:50:13
Comparing /work/SRC/openSUSE:12.1:Update:Test/sysconfig (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new (New)
Package is "sysconfig", Maintainer is "m...@suse.com"
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes
2012-03-05 14:16:17.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes
2012-03-23 14:50:15.0 +0100
@@ -1,0 +2,9 @@
+Wed Mar 14 12:41:45 UTC 2012 - m...@suse.com
+
+- Added tests to the 77-network.rules rule file if the /sbin/ifup
+ and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775),
+ disabled ipw3945d.sh script run and updated 81-mount.rules file
+ to work with more actual udev versions. Thanks to Robert Milasan,
+ who proposed these changes.
+
+--
New:
0011-Test-if-scripts-used-in-77-network.rules-exists.patch
0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch
Other differences:
--
++ sysconfig.spec ++
--- /var/tmp/diff_new_pack.opnqAb/_old 2012-03-23 14:50:15.0 +0100
+++ /var/tmp/diff_new_pack.opnqAb/_new 2012-03-23 14:50:15.0 +0100
@@ -40,6 +40,8 @@
Patch8: 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch
Patch9: 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch
Patch10:0010-network-start-fails-under-systemd.test.patch
+Patch11:0011-Test-if-scripts-used-in-77-network.rules-exists.patch
+Patch12:0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch
%description
This package provides the SuSE system configuration scheme and
@@ -69,6 +71,8 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
+%patch12 -p1
%build
autoreconf --force --install
++ 0011-Test-if-scripts-used-in-77-network.rules-exists.patch ++
>From 8bdf8febc33806a278c79a7a09ecf66dcaa58510 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Wed, 14 Mar 2012 13:50:03 +0100
Subject: [PATCH] Test if scripts used in 77-network.rules exists
Added tests to the 77-network.rules rule file if the /sbin/ifup
and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775).
Also disabled the IMO obsolete ipw3945d.sh script run completely.
Thanks to Robert Milasan, who proposed these changes.
Signed-off-by: Marius Tomaschewski
---
config/77-network.rules |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/config/77-network.rules b/config/77-network.rules
index f86a8e3..56b7927 100644
--- a/config/77-network.rules
+++ b/config/77-network.rules
@@ -1,11 +1,12 @@
# Driver module ipw3945 requires an userspace daemon to register network
-# interfaces.
-SUBSYSTEM=="drivers", ACTION=="add", DEVPATH=="/bus/pci/drivers/ipw3945",
RUN+="ipw3945d.sh"
+# interfaces.
+# Commented it out -- looks like something old & obsolete.
+#SUBSYSTEM=="drivers", ACTION=="add", DEVPATH=="/bus/pci/drivers/ipw3945",
TEST=="ipw3945d.sh", RUN+="ipw3945d.sh"
#
# Apply per interface sysctl settings before setup (see man 5 ifsysctl):
#
-SUBSYSTEM=="net", ACTION=="add",
RUN+="/etc/sysconfig/network/scripts/ifup-sysctl $env{INTERFACE} -o hotplug"
+SUBSYSTEM=="net", ACTION=="add",
TEST=="/etc/sysconfig/network/scripts/ifup-sysctl",
RUN+="/etc/sysconfig/network/scripts/ifup-sysctl $env{INTERFACE} -o hotplug"
#
# The following rules are to:
@@ -21,6 +22,7 @@ SUBSYSTEM=="net", ACTION=="add",
RUN+="/etc/sysconfig/network/scripts/ifup-sysct
# We do it here name based for the well known/default interface names,
# ifup makes it again by interface type to catch also custom names.
#
+SUBSYSTEM=="net", TEST!="/sbin/ifup", GOTO="skip_ifup"
SUBSYSTEM=="net",
ENV{INTERFACE}=="lo*|dummy*|vif*.*|br*|bond*|vlan*|gre*|sit*|tap*|tun*|ipip*|ip6tnl*|ipsec*|ppp*|ippp*|isdn*|modem*|dsl*|plip*|irda*",
GOTO="skip_ifup"
SUBSYSTEM=="net", ACTION=="add", RUN+="/sbin/ifup $env{INTERFACE} -o hotplug"
SUBSYSTEM=="net", ACTION=="remove", RUN+="/sbin/ifdown %k -o hotplug"
--
1.7.7
++ 0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch ++
>From 2b58cc51bc593b06fae0201b4f65d7fa9992fc28 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Wed, 14 Mar 2012 13:50:53 +0100
Subject: [PATCH] Corrected IMPORT in hardware/81-mount.rules
Use IMPORT{program}="udevmountd" instead of IMPORT="udevmountd"
as needed by more actual udev versions (>= udev-128, udev-181
does not understand it rules without {program} any more).
Thanks to Robert Milasan, who proposed these changes.
Signed-off-by: Marius Tomaschewski
---
config/hardware/81-mount.rules |2 +-
1 f
commit sysconfig for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package sysconfig for
openSUSE:12.1:Update:Test checked in at 2012-03-05 14:16:15
Comparing /work/SRC/openSUSE:12.1:Update:Test/sysconfig (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new (New)
Package is "sysconfig", Maintainer is "m...@suse.com"
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes
2012-01-11 18:28:44.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes
2012-03-05 14:16:17.0 +0100
@@ -1,0 +2,11 @@
+Wed Feb 29 10:33:28 UTC 2012 - m...@suse.com
+
+- Enabled to always enable the -o boot under systemd, improved
+ to use PID in log messages and extradebug outputs (bnc#737636).
+- Filter out labeled ipv4 addresses in get_ipv4address used
+ to fetch the 1st address from the TUNNEL_DEVICE interface.
+ Allows to configure a label for each address that should
+ be skipped. Updated ifcfg-tunnel.5 man page. (bnc#741453)
+ Thanks to Jon Nelson for his report with a fix proposal!
+
+--
New:
0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch
0010-network-start-fails-under-systemd.test.patch
Other differences:
--
++ sysconfig.spec ++
--- /var/tmp/diff_new_pack.yY3TMH/_old 2012-03-05 14:16:18.0 +0100
+++ /var/tmp/diff_new_pack.yY3TMH/_new 2012-03-05 14:16:18.0 +0100
@@ -38,6 +38,8 @@
Patch6: 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch
Patch7: 0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch
Patch8: 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch
+Patch9: 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch
+Patch10:0010-network-start-fails-under-systemd.test.patch
%description
This package provides the SuSE system configuration scheme and
@@ -65,6 +67,8 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
%build
autoreconf --force --install
++ 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch ++
>From 9406966c8f3028c18c21c261a41aa6b386340fee Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Wed, 25 Jan 2012 10:59:55 +0100
Subject: [PATCH] Filter out labeled ipv4 addresses in get_ipv4address
Filter out labeled ipv4 addresses in get_ipv4address used
to fetch the 1st address from the TUNNEL_DEVICE interface.
Allows to configure a label for each address that should
be skipped. Updated ifcfg-tunnel.5 man page. (bnc#741453)
Thanks to Jon Nelson for his report with a fix proposal!
Signed-off-by: Marius Tomaschewski
---
doc/ifcfg-tunnel.5 |6 --
scripts/functions |5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/doc/ifcfg-tunnel.5 b/doc/ifcfg-tunnel.5
index d7aef6c..7064ab9 100644
--- a/doc/ifcfg-tunnel.5
+++ b/doc/ifcfg-tunnel.5
@@ -65,9 +65,11 @@ The address of the local tunnel's end could be directly
specified in
variable. The address must be present on an existing interface of this host
(the TUNNEL_DEVICE). If
.B TUNNEL_LOCAL_IPADDR
-is empty the first ipv4 address from the interface given in the variable
+is empty the first ipv4 address without label from the interface given in the
+variable
.B TUNNEL_DEVICE
-will be used.
+will be used. You can configure a label for each additional address on the
+interface, that you don't want to use.
.TP
.B TUNNEL_REMOTE_IPADDR
The address of the remote tunnel's end.
diff --git a/scripts/functions b/scripts/functions
index 9bf48d2..5cb58b8 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -374,7 +374,8 @@ get_bonding_slave_hwaddrs()
return 1
}
-# This will echo the first address listed for the given interface.
+# This will echo the first address listed for the given interface
+# ignoring all addresses with a label.
get_ipv4address () {
test -z "$1" && return 1
local a b c
@@ -382,7 +383,7 @@ get_ipv4address () {
if [ "$a" = inet ] ; then
break
fi
- done < <(LC_ALL=POSIX ip -4 address list "$1" 2>/dev/null)
+ done < <(LC_ALL=POSIX ip -4 address show dev "$1" label "$1"
2>/dev/null)
test -z "$b" && return 1
echo ${b%%/*}
}
--
1.7.7
++ 0010-network-start-fails-under-systemd.test.patch ++
>From 4ee376fb64ac023cdaa6c78f4c1768e4f0986414 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Wed, 15 Feb 2012 18:50:14 +0100
Subject: [PATCH 1/3] Use all args in scripts/extradebug file names
Signed-off-by: Marius Tomaschewski
---
scripts/extradebug |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/scripts/extradebug b/scr
commit sysconfig for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package sysconfig for
openSUSE:12.1:Update:Test checked in at 2012-01-11 18:28:43
Comparing /work/SRC/openSUSE:12.1:Update:Test/sysconfig (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new (New)
Package is "sysconfig", Maintainer is "m...@suse.com"
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes
2011-12-19 18:24:18.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes
2012-01-11 18:28:44.0 +0100
@@ -1,0 +2,25 @@
+Tue Jan 10 09:46:26 UTC 2012 - m...@suse.com
+
+- Explicitly disabled posix mode in all bash scripts as we are
+ using several features not supported in posix mode (bnc#739338).
+
+--
+Thu Jan 5 17:48:18 UTC 2012 - m...@suse.com
+
+- Fixed ipv6 dad / link ready wait time calculation (1/10 of the
+ specified time) and replaced useless up flag check loop with
+ link_ready_wait to avoid send errors from dhclient6 (bnc#697929).
+
+--
+Wed Jan 4 18:40:19 UTC 2012 - m...@suse.com
+
+- Added to require vlan, bridge-utils and tunctl packages via spec,
+ that are often required in base networking configurations and
+ are missed otherwise in 2nd installation stage, that may be
+ unable to install them for some reason (bnc#733118).
+- Added X-Systemd-RemainAfterExit: true LSB header (bnc#727771)
+- Do not suggest dhcp6c client from dropped dhcpv6 package
+ in ifup-dhcp, marked dhcp6c as deprecated in network/dhcp
+ and changed to use dhclient6 as first choice (bnc#734723).
+
+--
New:
0004-Do-not-suggest-dropped-dhcp6c-client.patch
0005-Added-X-Systemd-RemainAfterExit-true-LSB-init-header.patch
0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch
0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch
0008-Disabled-bash-posix-mode-to-allow-bash-features.patch
Other differences:
--
++ sysconfig.spec ++
--- /var/tmp/diff_new_pack.crTTCZ/_old 2012-01-11 18:28:44.0 +0100
+++ /var/tmp/diff_new_pack.crTTCZ/_new 2012-01-11 18:28:44.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysconfig
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -16,6 +16,7 @@
#
+
Name: sysconfig
Version:0.75.4
Release:0
@@ -26,12 +27,17 @@
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
+Requires: iproute2 dbus-1 procps vlan bridge-utils tunctl
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
Patch1: 0001-sysconfig-nm-online-timeout-0-default.patch
Patch2: 0002-Fixed-order-of-addr-flush-and-link-down-in-ifdown.patch
Patch3: 0003-CVE-2011-4182-fixed-quoting-in-ifservices-script.patch
+Patch4: 0004-Do-not-suggest-dropped-dhcp6c-client.patch
+Patch5: 0005-Added-X-Systemd-RemainAfterExit-true-LSB-init-header.patch
+Patch6: 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch
+Patch7: 0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch
+Patch8: 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch
%description
This package provides the SuSE system configuration scheme and
@@ -54,6 +60,11 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
%build
autoreconf --force --install
++ 0004-Do-not-suggest-dropped-dhcp6c-client.patch ++
>From b4a890149ada6af9b506c9c46157d4446b71c04a Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Mon, 5 Dec 2011 17:36:22 +0100
Subject: [PATCH] Do not suggest dropped dhcp6c client
Do not suggest dhcp6c client from dropped dhcpv6 package
in ifup-dhcp, marked dhcp6c as deprecated in network/dhcp
and changed to use dhclient6 as first choice (bnc#734723).
Signed-off-by: Marius Tomaschewski
---
config/sysconfig.dhcp-network | 13 -
scripts/ifup-dhcp |8
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/config/sysconfig.dhcp-network b/config/sysconfig.dhcp-network
index 3a5c21e..17c9688 100644
--- a/config/sysconfig.dhcp-network
+++ b/config/sysconfig.dhcp-network
@@ -16,23
commit sysconfig for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package sysconfig for
openSUSE:12.1:Update:Test checked in at 2011-12-19 18:24:13
Comparing /work/SRC/openSUSE:12.1:Update:Test/sysconfig (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new (New)
Package is "sysconfig", Maintainer is "m...@suse.com"
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes
2011-12-19 18:24:18.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes
2011-12-19 18:24:18.0 +0100
@@ -1,0 +2,11 @@
+Mon Dec 19 09:41:09 UTC 2011 - m...@suse.com
+
+- Fixed to quote config / interface variables in ifservices script
+ and cleaned up content of the ESSID which gets appended to them
+ by NetworkManager dispatcher hook (bnc#735394, CVE-2011-4182).
+ Fixed also to return proper exit code 0 in NM dispatcher hooks.
+- Changed to call ip addr flush in ifdown, but after ip link set
+ down as it does not cause ipv6 sysctl tree side effects then
+ at least with more recent kernels (bnc#580018,bnc#559170).
+
+--
Old:
sysconfig-nm-online-timeout-0-default.patch
New:
0001-sysconfig-nm-online-timeout-0-default.patch
0002-Fixed-order-of-addr-flush-and-link-down-in-ifdown.patch
0003-CVE-2011-4182-fixed-quoting-in-ifservices-script.patch
Other differences:
--
++ sysconfig.spec ++
--- /var/tmp/diff_new_pack.JzMu8m/_old 2011-12-19 18:24:19.0 +0100
+++ /var/tmp/diff_new_pack.JzMu8m/_new 2011-12-19 18:24:19.0 +0100
@@ -15,24 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: sysconfig
Version:0.75.4
Release:0
Summary:The sysconfig scheme and traditional network scripts
-Url:http://gitorious.org/opensuse/sysconfig
+License:GPL-2.0+
Group: System/Base
-License:GPLv2+
-AutoReqProv:on
+Url:http://gitorious.org/opensuse/sysconfig
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
-Patch1: sysconfig-nm-online-timeout-0-default.patch
+Patch1: 0001-sysconfig-nm-online-timeout-0-default.patch
+Patch2: 0002-Fixed-order-of-addr-flush-and-link-down-in-ifdown.patch
+Patch3: 0003-CVE-2011-4182-fixed-quoting-in-ifservices-script.patch
%description
This package provides the SuSE system configuration scheme and
@@ -53,6 +52,8 @@
%prep
%setup -n sysconfig-%{version}
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
autoreconf --force --install
++ 0001-sysconfig-nm-online-timeout-0-default.patch ++
>From 578a4f46906883e376ec36261bdaee4e823421da Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Mon, 10 Oct 2011 13:13:49 +0200
Subject: [PATCH] Changed NM_ONLINE_TIMEOUT default to 0
Changed NM_ONLINE_TIMEOUT default back to 0 to avoid
unneeded waiting for NM interfaces at boot (bnc#722304)
Signed-off-by: Marius Tomaschewski
---
config/sysconfig.config-network |4 ++--
sysconfig.spec.in | 18 --
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/config/sysconfig.config-network b/config/sysconfig.config-network
index 1f8d05a..38e3eb1 100644
--- a/config/sysconfig.config-network
+++ b/config/sysconfig.config-network
@@ -226,7 +226,7 @@ IFPLUGD_OPTIONS="-f -I -b"
NETWORKMANAGER=no
## Type: int
-## Default:30
+## Default:0
#
# When using NetworkManager you may define a timeout to wait for NetworkManager
# to connect in /etc/init.d/network(-remotefs) script. Other network services
@@ -234,7 +234,7 @@ NETWORKMANAGER=no
#
# This variable has no effect if NETWORKMANAGER=no.
#
-NM_ONLINE_TIMEOUT="30"
+NM_ONLINE_TIMEOUT="0"
## Type:string
## Default: "dns-resolver dns-bind ntp-runtime nis"
diff --git a/sysconfig.spec.in b/sysconfig.spec.in
index f559763..b64d677 100644
--- a/sysconfig.spec.in
+++ b/sysconfig.spec.in
@@ -119,13 +119,6 @@ if [ ${1:-0} -gt 1 ]; then
if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then
touch etc/sysconfig/network/__move_shm_sysconfig__
fi
- # set a mark when updating from NM_ONLINE_TIMEOUT=0
- eval NM_ONLINE_TIMEOUT='' \
- `grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \
- var/adm/fillup-templates/sysconfig.config-network`
- if [ "x$NM_ONLINE_TIMEOUT" = "x0" ] ; then
-
