Hello community,
here is the log from the commit of package sysconfig for openSUSE:Factory
checked in at 2013-10-18 19:24:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysconfig (Old)
and /work/SRC/openSUSE:Factory/.sysconfig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2013-09-29
19:29:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2013-10-18
19:25:55.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Oct 14 13:07:27 UTC 2013 - vci...@suse.com
+
+- set SELinux label for /dev/.sysconfig after creation (bnc#845792)
+ * sysconfig-0.81.5-restore_selinux_context_on_RUN_FILES_BASE.patch
+- use systemctl when possible instead of calling init scripts directly
+ * sysconfig-0.81.5-netconfig-use_systemctl.patch
+
+-------------------------------------------------------------------
+Wed Oct 2 15:02:09 UTC 2013 - m...@suse.de
+
+- bt878 card causes udevd to complain (bnc#800897)
+ Fixed to use 'echo' shell builtin instead /bin/echo
+
+-------------------------------------------------------------------
New:
----
0001-bt878-card-causes-udevd-to-complain-bnc-800897.patch
sysconfig-0.81.5-netconfig-use_systemctl.patch
sysconfig-0.81.5-restore_selinux_context_on_RUN_FILES_BASE.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.texuJc/_old 2013-10-18 19:25:56.000000000 +0200
+++ /var/tmp/diff_new_pack.texuJc/_new 2013-10-18 19:25:56.000000000 +0200
@@ -38,6 +38,9 @@
Requires: udevmountd = %{version}
Requires: sysvinit(network)
Recommends: sysconfig-network = %{version}
+Patch1: 0001-bt878-card-causes-udevd-to-complain-bnc-800897.patch
+Patch2: sysconfig-0.81.5-netconfig-use_systemctl.patch
+Patch3:
sysconfig-0.81.5-restore_selinux_context_on_RUN_FILES_BASE.patch
%description
This package provides the SuSE system configuration scheme for the
@@ -119,6 +122,9 @@
%prep
%setup -n sysconfig-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
autoreconf --force --install
++++++ 0001-bt878-card-causes-udevd-to-complain-bnc-800897.patch ++++++
>From 312c427ae58ce78297384d1599ac32cce7f29e50 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <m...@suse.com>
Date: Wed, 2 Oct 2013 16:21:30 +0200
Subject: [PATCH] bt878 card causes udevd to complain (bnc#800897)
Fixed to use 'echo' shell builtin instead /bin/echo
---
config/hardware/50-blacklist.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/hardware/50-blacklist.conf
b/config/hardware/50-blacklist.conf
index dd2796c..58a6c8b 100644
--- a/config/hardware/50-blacklist.conf
+++ b/config/hardware/50-blacklist.conf
@@ -168,7 +168,7 @@ blacklist dpt_i2o
# look in /usr/src/linux/Documentation/video4linux/CARDLIST.bttv.
alias pci:v0000109Ed0000036Esv00000000sd00000000bc04sc00i00 bttv_skip_it
alias pci:v0000109Ed00000878sv00000000sd00000000bc04sc80i00 bttv_skip_it
-install bttv_skip_it /bin/echo "module alias skipped (bt878 chip without PCI
Subsystem ID)"
+install bttv_skip_it echo "module alias skipped (bt878 chip without PCI
Subsystem ID)"
# For some bridges both intel-agp and i82875p_edac are loaded. If i82875p_edac
# is loaded first it will grab the device. Then intel-agp doesn't work.
--
1.8.1.4
++++++ sysconfig-0.81.5-netconfig-use_systemctl.patch ++++++
Index: sysconfig-0.81.5/scripts/netconfig.d/nis
===================================================================
--- sysconfig-0.81.5.orig/scripts/netconfig.d/nis 2013-10-11
15:17:18.468338773 +0200
+++ sysconfig-0.81.5/scripts/netconfig.d/nis 2013-10-11 16:35:57.462096834
+0200
@@ -444,7 +444,9 @@ write_nisdomainname
# here we should restart services if needed
# => reload ypbind
-if [ -x $r/etc/init.d/ypbind ]; then
+if [ "$(cat /proc/1/comm)" = "systemd" ]; then
+ systemctl reload ypbind >/dev/null 2>&1
+elif [ -x $r/etc/init.d/ypbind ]; then
$r/etc/init.d/ypbind reload >/dev/null 2>&1
fi
Index: sysconfig-0.81.5/scripts/netconfig.d/ntp-runtime
===================================================================
--- sysconfig-0.81.5.orig/scripts/netconfig.d/ntp-runtime 2013-10-11
16:19:18.107435944 +0200
+++ sysconfig-0.81.5/scripts/netconfig.d/ntp-runtime 2013-10-14
15:01:30.194514004 +0200
@@ -226,8 +226,16 @@ do_runtime_update()
NTP_CONF="/etc/ntp.conf"
NTPDC_BIN="/usr/sbin/ntpdc"
+ local status
+ if [ "$(cat /proc/1/comm)" = "systemd" ]; then
+ systemctl status ntp >/dev/null 2>&1
+ elif [ -x $r/etc/init.d/ntp ]; then
+ $r/etc/init.d/ntp status >/dev/null 2>&1
+ fi
+ status=$?
+
if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && \
- /etc/init.d/ntp status >/dev/null 2>/dev/null ; then
+ [ $status -eq 0 ]; then
NTP_KEYS=$(awk -- '/^keys/ { print $2 }' $NTP_CONF 2>/dev/null)
NTP_KEYID=$(awk -- '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF
2>/dev/null)
NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS"
&& \
++++++ sysconfig-0.81.5-restore_selinux_context_on_RUN_FILES_BASE.patch ++++++
Index: sysconfig-0.81.5/scripts/functions.common
===================================================================
--- sysconfig-0.81.5.orig/scripts/functions.common 2013-08-26
14:07:16.000000000 +0200
+++ sysconfig-0.81.5/scripts/functions.common 2013-10-14 15:55:13.593021737
+0200
@@ -28,6 +28,7 @@
# It __must__ __not__ contain a trailing slash.
RUN_FILES_BASE=/dev/.sysconfig/network
test -d $RUN_FILES_BASE || mkdir -p $RUN_FILES_BASE
+restorecon -R /dev/.sysconfig 2>/dev/null || :
#####################################################################
# Returnvalues
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
