shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-28 07:21:32 +03:00
Code

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

Browse Source
This commit is contained in:
Lennart Poettering 2011-04-06 19:36:06 +02:00
parent 4466194c43
commit 03aea2aecd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsck.c
View 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) {

2
src/locale-setup.c
View 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],

2
src/quotacheck.c
View 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) {

2
src/vconsole-setup.c
View 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,