From d25cc648fed1d6902d07c74afd71458f971ab314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 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.652.g0d6e0ce