From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 15 Dec 2016 16:46:06 +0000 (+0100)
Subject: gpt-auto-generator: drop duplicate container check
X-Git-Tag: v233~237^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47f9472950fa51f48cbe610549e00fb05246922c;p=thirdparty%2Fsystemd.git

gpt-auto-generator: drop duplicate container check

We already check for containers early in main(), no need to do this
check again.
---

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index e506f395218..872b654ad88 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -463,11 +463,6 @@ static int add_esp(const char *what) {
                 return 0;
         }
 
-        if (detect_container() > 0) {
-                log_debug("In a container, ignoring the ESP.");
-                return 0;
-        }
-
         /* If /efi exists we'll use that. Otherwise we'll use /boot, as that's usually the better choice */
         esp = access("/efi/", F_OK) >= 0 ? "/efi" : "/boot";