shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-06 01:57:47 +03:00
Code

container: skip a few things when we are run in a container such as accessing /proc/cmdline

Browse Source
This commit is contained in:
Lennart Poettering 2011-03-14 23:41:47 +01:00
parent 1f16b4a6c4
commit 2fc9784656
6 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/condition.c
View File

@ -67,6 +67,9 @@ static bool test_kernel_command_line(const char *parameter) {
assert(parameter); assert(parameter);
if (detect_virtualization(NULL) > 0)
return false;
if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) { if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
return false; return false;

3
src/fsck.c
View File

@ -106,6 +106,9 @@ static int parse_proc_cmdline(void) {
int r; int r;
size_t l; size_t l;
if (detect_virtualization(NULL) > 0)
return 0;
if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) { if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
return 0; return 0;

39
src/locale-setup.c
View File

@ -69,28 +69,29 @@ int locale_setup(void) {
zero(variables); zero(variables);
if ((r = parse_env_file("/proc/cmdline", WHITESPACE, if (detect_virtualization(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
#ifdef TARGET_FEDORA #ifdef TARGET_FEDORA
"LANG", &variables[VARIABLE_LANG], "LANG", &variables[VARIABLE_LANG],
#endif #endif
"locale.LANG", &variables[VARIABLE_LANG], "locale.LANG", &variables[VARIABLE_LANG],
"locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE], "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE],
"locale.LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC], "locale.LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC],
"locale.LC_TIME", &variables[VARIABLE_LC_TIME], "locale.LC_TIME", &variables[VARIABLE_LC_TIME],
"locale.LC_COLLATE", &variables[VARIABLE_LC_COLLATE], "locale.LC_COLLATE", &variables[VARIABLE_LC_COLLATE],
"locale.LC_MONETARY", &variables[VARIABLE_LC_MONETARY], "locale.LC_MONETARY", &variables[VARIABLE_LC_MONETARY],
"locale.LC_MESSAGES", &variables[VARIABLE_LC_MESSAGES], "locale.LC_MESSAGES", &variables[VARIABLE_LC_MESSAGES],
"locale.LC_PAPER", &variables[VARIABLE_LC_PAPER], "locale.LC_PAPER", &variables[VARIABLE_LC_PAPER],
"locale.LC_NAME", &variables[VARIABLE_LC_NAME], "locale.LC_NAME", &variables[VARIABLE_LC_NAME],
"locale.LC_ADDRESS", &variables[VARIABLE_LC_ADDRESS], "locale.LC_ADDRESS", &variables[VARIABLE_LC_ADDRESS],
"locale.LC_TELEPHONE", &variables[VARIABLE_LC_TELEPHONE], "locale.LC_TELEPHONE", &variables[VARIABLE_LC_TELEPHONE],
"locale.LC_MEASUREMENT", &variables[VARIABLE_LC_MEASUREMENT], "locale.LC_MEASUREMENT", &variables[VARIABLE_LC_MEASUREMENT],
"locale.LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION], "locale.LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION],
NULL)) < 0) { NULL)) < 0) {
if (r != -ENOENT) if (r != -ENOENT)
log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); log_warning("Failed to read /proc/cmdline: %s", strerror(-r));
} }
/* Hmm, nothing set on the kernel cmd line? Then let's /* Hmm, nothing set on the kernel cmd line? Then let's
* try /etc/locale.conf */ * try /etc/locale.conf */

3
src/quotacheck.c
View File

@ -35,6 +35,9 @@ static int parse_proc_cmdline(void) {
int r; int r;
size_t l; size_t l;
if (detect_virtualization(NULL) > 0)
return 0;
if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) { if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
return 0; return 0;

3
src/target.c
View File

@ -92,6 +92,9 @@ static int target_add_getty_dependencies(Target *t) {
if (!unit_has_name(UNIT(t), SPECIAL_GETTY_TARGET)) if (!unit_has_name(UNIT(t), SPECIAL_GETTY_TARGET))
return 0; return 0;
if (detect_container(NULL) > 0)
return 1;
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) { if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
const char *tty; const char *tty;

25
src/vconsole-setup.c
View File

@ -176,21 +176,22 @@ int main(int argc, char **argv) {
utf8 = is_locale_utf8(); utf8 = is_locale_utf8();
if ((r = parse_env_file("/proc/cmdline", WHITESPACE, if (detect_virtualization(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
#ifdef TARGET_FEDORA #ifdef TARGET_FEDORA
"SYSFONT", &vc_font, "SYSFONT", &vc_font,
"KEYTABLE", &vc_keymap, "KEYTABLE", &vc_keymap,
#endif #endif
"vconsole.keymap", &vc_keymap, "vconsole.keymap", &vc_keymap,
"vconsole.keymap.toggle", &vc_keymap_toggle, "vconsole.keymap.toggle", &vc_keymap_toggle,
"vconsole.font", &vc_font, "vconsole.font", &vc_font,
"vconsole.font.map", &vc_font_map, "vconsole.font.map", &vc_font_map,
"vconsole.font.unimap", &vc_font_unimap, "vconsole.font.unimap", &vc_font_unimap,
NULL)) < 0) { NULL)) < 0) {
if (r != -ENOENT) if (r != -ENOENT)
log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); log_warning("Failed to read /proc/cmdline: %s", strerror(-r));
} }
/* Hmm, nothing set on the kernel cmd line? Then let's /* Hmm, nothing set on the kernel cmd line? Then let's
* try /etc/vconsole.conf */ * try /etc/vconsole.conf */