cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
This commit is contained in:
+1
-1
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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],
|
||||
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user