From 121c5c060ba3c72dedb56df834a52930ad7f2f8e Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Fri, 16 Apr 2004 12:24:46 +0000 Subject: [PATCH] Ignore error setting selinux file context if fs doesn't support it. --- WHATS_NEW | 4 ++++ WHATS_NEW_DM | 4 ++++ lib/misc/selinux.c | 2 +- libdm/libdm-common.c | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 37d957319..dd2a16f33 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,3 +1,7 @@ +Version 2.00.13 - 64 Apr 2004 +============================= + Ignore error setting selinux file context if fs doesn't support it. + Version 2.00.12 - 14 Apr 2004 ============================= Install a default lvm.conf into /etc/lvm if there isn't one already. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index f1885a675..258f7fc4e 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,7 @@ +Version 1.00.16 - 16 Apr 2004 +============================= + Ignore error setting selinux file context if fs doesn't support it. + Version 1.00.15 - 7 Apr 2004 ============================ Fix status overflow check in kernel patches. diff --git a/lib/misc/selinux.c b/lib/misc/selinux.c index 15fe66104..e47ae1d99 100644 --- a/lib/misc/selinux.c +++ b/lib/misc/selinux.c @@ -31,7 +31,7 @@ int set_selinux_context(const char *path) return 0; } - if (lsetfilecon(path, scontext) < 0) { + if ((lsetfilecon(path, scontext) < 0) && (errno != ENOTSUP)) { log_sys_error("lsetfilecon", path); free(scontext); return 0; diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 86afb0743..b7454dc3c 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -215,7 +215,7 @@ static int _set_selinux_context(const char *path) return 0; } - if (lsetfilecon(path, scontext) < 0) { + if ((lsetfilecon(path, scontext) < 0) && (errno != ENOTSUP)) { log_error("%s: lsetfilecon failed: %s", path, strerror(errno)); free(scontext); return 0;