Re: [PATCH] restorecon: Only log error on readonly fs (bsc#1257996)

[Petr Lautrbach <lautrbach@redhat.com>]

Cathy Hu <cahu@suse.de> writes:

> Signed-off-by: Cathy Hu <cahu@suse.de>
> ---
> RFC Patch for the issue described in thread "Question regarding restorecon and btrfs read-only snapshots"
>

Could you point me where I can find the thread and is bsc#1257996?

What's the expected outcome? Before this change I see:

$ sudo restorecon -R -v /mnt/
restorecon: Could not set context for /mnt:  Read-only file system
restorecon: Could not set context for /mnt/lost+found:  Read-only file system
restorecon: Could not set context for /mnt/a:  Read-only file system
restorecon: Could not set context for /mnt/1:  Read-only file system

After:

$ sudo restorecon -R -v /mnt/
Read only filesystem, relabel not possible: /mnt
Read only filesystem, relabel not possible: /mnt/lost+found
Read only filesystem, relabel not possible: /mnt/a
Read only filesystem, relabel not possible: /mnt/1

This seems to be only a cosmetic change.

Petr


>  libselinux/src/selinux_restorecon.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/libselinux/src/selinux_restorecon.c b/libselinux/src/selinux_restorecon.c
> index 8fadf4d2..e8545e27 100644
> --- a/libselinux/src/selinux_restorecon.c
> +++ b/libselinux/src/selinux_restorecon.c
> @@ -774,10 +774,14 @@ static int restorecon_sb(const char *pathname, const struct stat *sb,
>  		if (!flags->nochange) {
>  			if (lsetfilecon(pathname, newcon) < 0) {
>  				/* Ignore files removed during relabeling if ignore_noent is set */
> -				if (flags->ignore_noent && errno == ENOENT)
> +				if (flags->ignore_noent && errno == ENOENT) {
>  					goto out;
> -				else
> +				} else if (errno == EROFS) {
> +					selinux_log(SELINUX_INFO, "Read only filesystem, relabel not possible: %s\n", pathname);
> +					goto out;
> +				} else {
>  					goto err;
> +				}
>  			}
>  
>  			updated = true;
> -- 
> 2.53.0