From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Apr 2011 17:36:06 +0000 (+0200)
Subject: cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
X-Git-Tag: v24~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=03aea2aecd6f9d2193af5d6cf866063da8d47ad5;p=elogind.git

cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
---

diff --git a/src/fsck.c b/src/fsck.c
index 7b809b32b..19ca75311 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -106,7 +106,7 @@ static int parse_proc_cmdline(void) {
         int r;
         size_t l;
 
-        if (detect_virtualization(NULL) > 0)
+        if (detect_container(NULL) > 0)
                 return 0;
 
         if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
diff --git a/src/locale-setup.c b/src/locale-setup.c
index 39b877cab..08e289d4e 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -69,7 +69,7 @@ int locale_setup(void) {
 
         zero(variables);
 
-        if (detect_virtualization(NULL) <= 0)
+        if (detect_container(NULL) <= 0)
                 if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
 #ifdef TARGET_FEDORA
                                         "LANG",                     &variables[VARIABLE_LANG],
diff --git a/src/quotacheck.c b/src/quotacheck.c
index c7b20a60e..ba12b27ca 100644
--- a/src/quotacheck.c
+++ b/src/quotacheck.c
@@ -35,7 +35,7 @@ static int parse_proc_cmdline(void) {
         int r;
         size_t l;
 
-        if (detect_virtualization(NULL) > 0)
+        if (detect_container(NULL) > 0)
                 return 0;
 
         if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 29ce7be77..67fb7b610 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -176,7 +176,7 @@ int main(int argc, char **argv) {
 
         utf8 = is_locale_utf8();
 
-        if (detect_virtualization(NULL) <= 0)
+        if (detect_container(NULL) <= 0)
                 if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
 #ifdef TARGET_FEDORA
                                         "SYSFONT", &vc_font,