diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-06 19:36:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-06 19:36:06 +0200 |
| commit | 03aea2aecd6f9d2193af5d6cf866063da8d47ad5 (patch) | |
| tree | 221f982096dcf06a37b13318dec63075ced5d415 | |
| parent | 4466194c43a25bc51b21226f04245131e698bb3f (diff) | |
cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
| -rw-r--r-- | src/fsck.c | 2 | ||||
| -rw-r--r-- | src/locale-setup.c | 2 | ||||
| -rw-r--r-- | src/quotacheck.c | 2 | ||||
| -rw-r--r-- | src/vconsole-setup.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/fsck.c b/src/fsck.c index 7b809b32b9..19ca75311b 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 39b877cabe..08e289d4ee 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 c7b20a60e6..ba12b27caa 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 29ce7be77e..67fb7b6100 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, |