diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-07-03 16:25:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-07-03 16:25:50 +0200 |
| commit | c9bc07646100855ff8193e1e62c52b77327e264d (patch) | |
| tree | 41a37615bb323ff5c6a5a212209ae12e6ec1b054 /src/core | |
| parent | 61b1477c8107e9b7143be9acf6bf678fa9d0674d (diff) | |
mount-setup: don't complain if we try to fix the label of a dir beneath a mount but can't due to EROFS
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/automount.c | 2 | ||||
| -rw-r--r-- | src/core/mount-setup.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index 64b6cff72e..697dfa1548 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -314,7 +314,7 @@ static int open_dev_autofs(Manager *m) { if (m->dev_autofs_fd >= 0) return m->dev_autofs_fd; - label_fix("/dev/autofs", false); + label_fix("/dev/autofs", false, false); if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) { log_error("Failed to open /dev/autofs: %s", strerror(errno)); 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); |