chiark / gitweb /
cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Apr 2011 17:36:06 +0000 (19:36 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 6 Apr 2011 17:36:06 +0000 (19:36 +0200)
src/fsck.c
src/locale-setup.c
src/quotacheck.c
src/vconsole-setup.c

index 7b809b3..19ca753 100644 (file)
@@ -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) {
index 39b877c..08e289d 100644 (file)
@@ -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],
index c7b20a6..ba12b27 100644 (file)
@@ -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) {
index 29ce7be..67fb7b6 100644 (file)
@@ -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,