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 "mt@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes 2012-01-11 18:28:44.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes 2012-03-05 14:16:17.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Feb 29 10:33:28 UTC 2012 - mt@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.000000000 +0100
+++ /var/tmp/diff_new_pack.yY3TMH/_new 2012-03-05 14:16:18.000000000 +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/scripts/extradebug
index 9a05933..2997a68 100755
--- a/scripts/extradebug
+++ b/scripts/extradebug
@@ -9,7 +9,8 @@ SCRIPT=${0##*/}
{ set +vx ; . /etc/sysconfig/network/scripts/functions.common ; } >&2
test -d $RUN_FILES_BASE && dir=$RUN_FILES_BASE || dir=/
-exec 2> $dir/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_$1.$2
+args="" ; for arg in "$@" ; do args="$args.$arg" ; done
+exec 2> "$dir/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_${args}"
date +"%F %T.%N" >&2
echo -------------------------------------------------- >&2
--
1.7.7
From ee9d2a28663852349bbf8a1eb315bba796f56b35 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Wed, 15 Feb 2012 18:51:45 +0100
Subject: [PATCH 2/3] Always enable boot-wait mode under systemd
Signed-off-by: Marius Tomaschewski
---
scripts/network | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/scripts/network b/scripts/network
index 77c3b3b..7ccb6ce 100755
--- a/scripts/network
+++ b/scripts/network
@@ -74,6 +74,9 @@ FS_FILTER=""
SD_RUNNING=no
SD_BOOTING=no
if systemd_running ; then
+ # systemd never calls status action,
+ # so always enable boot-wait mode ...
+ MODE=onboot
SD_RUNNING=yes
systemd_booting && SD_BOOTING=yes
fi
--
1.7.7
From e52f94ed16596cb123ea7801ceb849c30e483447 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski
Date: Wed, 15 Feb 2012 18:50:58 +0100
Subject: [PATCH 3/3] Include PID in log messages
Signed-off-by: Marius Tomaschewski
---
scripts/functions.common | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/functions.common b/scripts/functions.common
index 8542eb7..0b153ce 100644
--- a/scripts/functions.common
+++ b/scripts/functions.common
@@ -135,11 +135,11 @@ if [ "$USE_SYSLOG" != yes ] ; then
else
mesg() {
echo -e "$@" # >&2
- echo -e "$@" | logger -t "$SCRIPTNAME"
+ echo -e "$@" | logger -t "$SCRIPTNAME[$$]"
}
mesg_n() {
echo -ne "$@" # >&2
- echo -e "$@" | logger -t "$SCRIPTNAME"
+ echo -e "$@" | logger -t "$SCRIPTNAME[$$]"
}
fi
@@ -166,10 +166,10 @@ for level in err "#" "#" info debug; do
else
eval ${level}_mesg\(\) \{ echo -e \"\$\@\" 1\>\&2\; \
echo -e \"\$\@\" \
- \| logger -p $nl -t \"$SCRIPTNAME\" \; \}
+ \| logger -p $nl -t \"$SCRIPTNAME[\$\$]\" \; \}
eval ${level}_mesg_n\(\) \{ echo -ne \"\$\@\" 1\>\&2\; \
echo -e \"\$\@\" \
- \| logger -p $nl -t \"$SCRIPTNAME\" \; \}
+ \| logger -p $nl -t \"$SCRIPTNAME[\$\$]\" \; \}
fi
: $((nl++))
done
--
1.7.7
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org