.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=594

0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch

@@ -0,0 +1,27 @@
+Based on b2103dccb354de3f38c49c14ccb637bdf665e40f Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay@vrfy.org>
+Date: Sat, 5 Apr 2014 13:59:01 -0400
+Subject: [PATCH] reduce the amount of messages logged to /dev/kmsg when
+ "debug" is specified
+
+---
+ src/core/main.c |    8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- src/core/main.c
++++ src/core/main.c	2014-04-14 13:50:48.490814738 +0000
+@@ -412,12 +412,8 @@ static int parse_proc_cmdline_word(const
+                 if (arg_show_status == _SHOW_STATUS_UNSET)
+                         arg_show_status = SHOW_STATUS_AUTO;
+         } else if (streq(word, "debug")) {
+-                /* Log to kmsg, the journal socket will fill up before the
+-                 * journal is started and tools running during that time
+-                 * will block with every log message for for 60 seconds,
+-                 * before they give up. */
+-                log_set_max_level(LOG_DEBUG);
+-                log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_KMSG);
++                if (detect_container(NULL) > 0)
++                        log_set_target(LOG_TARGET_CONSOLE);
+         } else if (!in_initrd()) {
+                 unsigned i;
+ 

systemd-detect-xendom.patch

@@ -0,0 +1,35 @@
+diff -Naur systemd-210/src/shared/virt.c systemd-210-mod/src/shared/virt.c
+--- systemd-210/src/shared/virt.c	2014-02-24 15:38:03.909784909 +0100
++++ systemd-210/src/shared/virt.c	2014-04-10 13:48:05.568766957 +0200
+@@ -149,7 +149,7 @@
+ 
+ /* Returns a short identifier for the various VM implementations */
+ int detect_vm(const char **id) {
+-        _cleanup_free_ char *hvtype = NULL, *cpuinfo_contents = NULL;
++        _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL;
+         static thread_local int cached_found = -1;
+         static thread_local const char *cached_id = NULL;
+         const char *_id = NULL;
+@@ -166,13 +166,18 @@
+         /* Try high-level hypervisor sysfs file first:
+          *
+          * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */
+-        r = read_one_line_file("/sys/hypervisor/type", &hvtype);
++        r = read_one_line_file("/proc/xen/capabilities", &domcap);
+         if (r >= 0) {
+-                if (streq(hvtype, "xen")) {
+-                        _id = "xen";
++                if (strstr(domcap, "control_d")) {
++                        r = 0;
++                        _id = "xen-dom0";
++                } else {
+                         r = 1;
+-                        goto finish;
++                        _id = "xen-domU";
+                 }
++
++                goto finish;
++
+         } else if (r != -ENOENT)
+                 return r;
+ 

systemd-mini.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 14 13:55:36 UTC 2014 - werner@suse.de
+
+- Add backported upstream patch
+  0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
+- Add patch systemd-detect-xendom.patch from Thomas Blume
+  to be able to detect XEN dom0 as well as domU
+- systemd conflicts with sysvinit, ven if the package systemd-sysvinit
+  does already conflict with sysvinit-init (bnc#873444)
+
 -------------------------------------------------------------------
 Thu Apr 10 10:17:47 UTC 2014 - werner@suse.de
 

systemd-mini.spec

@@ -104,6 +104,9 @@ BuildRequires:  pkgconfig(libseccomp)
 %endif
 BuildRequires:  pkgconfig(libselinux) >= 2.1.9
 BuildRequires:  pkgconfig(libsepol)
+%if 0%{?suse_version} > 1310
+Conflicts:      sysvinit
+%endif
 %if 0%{?bootstrap}
 #!BuildIgnore:  dbus-1
 Requires:       this-is-only-for-build-envs
@@ -375,6 +378,10 @@ Patch192:       let-linker-find-libudev-for-libdevmapper.patch
 Patch193:       portmap-wants-rpcbind-socket.patch
 # PATCH-FIX-USTREAM added at 2014/03/11
 Patch194:       0007-dbus-suppress-duplicate-and-misleading-messages.patch
+# PATCH-FIX-USTREAM added at 2014/03/14
+Patch195:       0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
+# PATCH-FIX-SUSE Detect XEN dom0 as well as domU
+Patch196:       systemd-detect-xendom.patch
 
 # UDEV PATCHES
 # ============
@@ -737,6 +744,8 @@ cp %{SOURCE7} m4/
 %patch192 -p1
 %patch193 -p1
 %patch194 -p0
+%patch195 -p0
+%patch196 -p1
 
 # udev patches
 %patch1001 -p1

systemd.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 14 13:55:36 UTC 2014 - werner@suse.de
+
+- Add backported upstream patch
+  0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
+- Add patch systemd-detect-xendom.patch from Thomas Blume
+  to be able to detect XEN dom0 as well as domU
+- systemd conflicts with sysvinit, ven if the package systemd-sysvinit
+  does already conflict with sysvinit-init (bnc#873444)
+
 -------------------------------------------------------------------
 Thu Apr 10 10:17:47 UTC 2014 - werner@suse.de
 

systemd.spec

@@ -99,6 +99,9 @@ BuildRequires:  pkgconfig(libseccomp)
 %endif
 BuildRequires:  pkgconfig(libselinux) >= 2.1.9
 BuildRequires:  pkgconfig(libsepol)
+%if 0%{?suse_version} > 1310
+Conflicts:      sysvinit
+%endif
 %if 0%{?bootstrap}
 #!BuildIgnore:  dbus-1
 Requires:       this-is-only-for-build-envs
@@ -370,6 +373,10 @@ Patch192:       let-linker-find-libudev-for-libdevmapper.patch
 Patch193:       portmap-wants-rpcbind-socket.patch
 # PATCH-FIX-USTREAM added at 2014/03/11
 Patch194:       0007-dbus-suppress-duplicate-and-misleading-messages.patch
+# PATCH-FIX-USTREAM added at 2014/03/14
+Patch195:       0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
+# PATCH-FIX-SUSE Detect XEN dom0 as well as domU
+Patch196:       systemd-detect-xendom.patch
 
 # UDEV PATCHES
 # ============
@@ -732,6 +739,8 @@ cp %{SOURCE7} m4/
 %patch192 -p1
 %patch193 -p1
 %patch194 -p0
+%patch195 -p0
+%patch196 -p1
 
 # udev patches
 %patch1001 -p1