picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

selinux: don't relabel /run/initramfs

Browse source 
/run/initramfs usually contains the initrd so that we can jump back into
it on shutdown. It's usually relatively large and static data, hence we
should avoid relabelling of it. On my netbook this saves 6s. (6.6s
needed for relabelling /dev and /run goes down to 600ms -- still way too
much, but much better).
This commit is contained in:
Lennart Poettering 2011-08-30 00:16:00 +02:00
parent 4d4c74866c
commit edb4977837
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mount-setup.c
View file

@ -344,11 +344,18 @@ static int nftw_cb(
struct FTW *ftwbuf) {
/* No need to label /dev twice in a row... */
if (ftwbuf->level == 0)
return 0;
if (_unlikely_(ftwbuf->level == 0))
return FTW_CONTINUE;
/* /run/initramfs is static data and big, no need to
* dynamically relabel it at boot... */
if (_unlikely_(ftwbuf->level == 1 &&
tflag == FTW_D &&
streq(fpath, "/run/initramfs")))
return FTW_SKIP_SUBTREE;
label_fix(fpath, true);
return 0;
return FTW_CONTINUE;
};
int mount_setup(bool loaded_policy) {
@ -381,8 +388,8 @@ int mount_setup(bool loaded_policy) {
before_relabel = now(CLOCK_MONOTONIC);
nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
nftw("/run", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
nftw("/run", nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
after_relabel = now(CLOCK_MONOTONIC);