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 7b809b32b9c84be5d5ff342919952b74b0eea607..19ca75311ba50dbbfe20cadf81bbd12538e89f59 100644 (file)
--- 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 39b877cabeea3e78fcaea48330ec851404f6b8e0..08e289d4eed6c57a62965118286382a79e4d33cb 100644 (file)
--- 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 c7b20a60e6d5764ea37bfb5deda125f173936c26..ba12b27caa269215f50bdc1feabbb12991a609a6 100644 (file)
--- 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 29ce7be77e776e3dbe8c5a07bd801b492bf0ca23..67fb7b61002dcdcfb2352f9d51f85072ff5c445a 100644 (file)
--- 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,