fbd54ec893
(please also push to 13.1, I want the same version as F20) - Add 0001-gpt-auto-generator-exit-immediately-if-in-container.patch: don't start gpt auto-generator in container (git). - Add 0001-manager-when-verifying-whether-clients-may-change-en.patch: fix reload check in selinux case (git). - Add 0001-logind-fix-bus-introspection-data-for-TakeControl.patch: fix introspection for TakeControl (git). - Add 0001-mount-check-for-NULL-before-reading-pm-what.patch: fix crash when parsing some incorrect unit (git). - Add 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch: Fix udev rules parsing (git). - Add 0001-systemd-serialize-deserialize-forbid_restart-value.patch: Fix incorrect deserialization for forbid_restart (git). - Add 0001-core-unify-the-way-we-denote-serialization-attribute.patch: Ensure forbid_restart is named like other attributes (git). - Add 0001-journald-fix-minor-memory-leak.patch: fix memleak in journald (git). - Add 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch: Improve ACPI firmware performance parsing (git). - Add 0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch: Fix journal rotation (git). - Add 0001-login-fix-invalid-free-in-sd_session_get_vt.patch: Fix memory corruption in sd_session_get_vt (git). (forwarded request 203387 from fcrozat) OBS-URL: https://build.opensuse.org/request/show/203396 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=163
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From 9a5cb1371b6d8b0a04bd08665bcf9b06cb40c64c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Thu, 3 Oct 2013 22:13:01 -0400
|
|
Subject: [PATCH] gpt-auto-generator: exit immediately if in container
|
|
|
|
Otherwise we get an ugly warning when running systemd in
|
|
a container.
|
|
---
|
|
src/gpt-auto-generator/gpt-auto-generator.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
|
|
index ca54925..d2b4213 100644
|
|
--- a/src/gpt-auto-generator/gpt-auto-generator.c
|
|
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
|
|
@@ -38,6 +38,7 @@
|
|
#include "libudev.h"
|
|
#include "special.h"
|
|
#include "unit-name.h"
|
|
+#include "virt.h"
|
|
|
|
/* TODO:
|
|
*
|
|
@@ -481,6 +482,13 @@ int main(int argc, char *argv[]) {
|
|
umask(0022);
|
|
|
|
if (in_initrd()) {
|
|
+ log_debug("In initrd, exiting.");
|
|
+ r = 0;
|
|
+ goto finish;
|
|
+ }
|
|
+
|
|
+ if (detect_container(NULL) > 0) {
|
|
+ log_debug("In a container, exiting.");
|
|
r = 0;
|
|
goto finish;
|
|
}
|
|
--
|
|
1.8.4
|
|
|