From c9bc07646100855ff8193e1e62c52b77327e264d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 3 Jul 2012 16:25:50 +0200 Subject: mount-setup: don't complain if we try to fix the label of a dir beneath a mount but can't due to EROFS --- src/core/mount-setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/mount-setup.c') diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index cdbee14408..07794df049 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -121,7 +121,7 @@ static int mount_one(const MountPoint *p, bool relabel) { /* Relabel first, just in case */ if (relabel) - label_fix(p->where, true); + label_fix(p->where, true, true); if ((r = path_is_mount_point(p->where, true)) < 0) return r; @@ -150,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) { /* Relabel again, since we now mounted something fresh here */ if (relabel) - label_fix(p->where, false); + label_fix(p->where, false, false); return 1; } @@ -347,7 +347,7 @@ static int nftw_cb( if (_unlikely_(ftwbuf->level == 0)) return FTW_CONTINUE; - label_fix(fpath, true); + label_fix(fpath, false, false); /* /run/initramfs is static data and big, no need to * dynamically relabel its contents at boot... */ @@ -391,7 +391,7 @@ int mount_setup(bool loaded_policy) { /* Explicitly relabel these */ NULSTR_FOREACH(j, relabel) - label_fix(j, true); + label_fix(j, true, false); after_relabel = now(CLOCK_MONOTONIC); -- cgit v1.2.3-54-g00ecf