From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Wed, 11 Sep 2019 03:23:59 +0000 (-0400)
Subject: mount-setup: relabel items mentioned directly in relabel-extra.d
X-Git-Tag: v244-rc1~302
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71de68476c1897b8624538ce32218891251fa5f6;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index ea7b0a80cbd..fc6c5f6bef3 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++;
                 }