shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-06 13:17:44 +03:00
Code

core: move mount_setup_early() to main.c

Browse Source 
move mount_setup_early() call to main.c, before security module setup,
so there are no more repeat calls.
This commit is contained in:
Nathaniel Chen 2013-03-07 11:06:57 -08:00 committed by Lennart Poettering
parent bf93356088
commit 8f838d8aab
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/ima-setup.c
View File

@ -50,11 +50,6 @@ int ima_setup(void) {
int policyfd = -1, imafd = -1;
int result = 0;
#ifndef HAVE_SELINUX
/* Mount the securityfs filesystem */
mount_setup_early();
#endif
if (stat(IMA_POLICY_PATH, &st) < 0)
return 0;

1
src/core/main.c
View File

@ -1357,6 +1357,7 @@ int main(int argc, char *argv[]) {
}
if (!skip_setup) {
mount_setup_early();
if (selinux_setup(&loaded_policy) < 0)
goto finish;
if (ima_setup() < 0)

3
src/core/selinux-setup.c
View File

@ -58,9 +58,6 @@ int selinux_setup(bool *loaded_policy) {
cb.func_log = null_log;
selinux_set_callback(SELINUX_CB_LOG, cb);
/* Make sure getcon() works, which needs /proc and /sys */
mount_setup_early();
/* Already initialized by somebody else? */
r = getcon_raw(&con);
if (r == 0) {