diff options
| author | Benjamin Gilbert <bgilbert@redhat.com> | 2019-09-10 23:23:59 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-21 22:59:54 +0200 |
| commit | 29308bcc1326521081f4d7369945d325c2d41faa (patch) | |
| tree | cb98dcb439786e39d145b087c186bca623f3e12d | |
| parent | 8ca1e561657575a619a071ab0c22f474094ef21d (diff) | |
| download | systemd-29308bcc1326521081f4d7369945d325c2d41faa.tar.gz | |
mount-setup: relabel items mentioned directly in relabel-extra.d
relabel_extra() relabels the descendants of directories listed in
relabel-extra.d, but doesn't relabel the files or directories
explicitly named there. This makes it impossible to use
relabel-extra.d to relabel the root of a filesystem. Fix by
relabeling the named items too.
(cherry picked from commit 71de68476c1897b8624538ce32218891251fa5f6)
| -rw-r--r-- | src/core/mount-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index ea7b0a80cb..fc6c5f6bef 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -486,6 +486,7 @@ static int relabel_extra(void) { } log_debug("Relabelling additional file/directory '%s'.", line); + (void) label_fix(line, 0); (void) nftw(line, nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL); c++; } |