packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cope with xattr syscalls raising EOPNOTSUPP 

ENOTSUP and EOPNOTSUPP are numerically equal on most Linux ports,
but inexplicably differ on PA-RISC (hppa) and possibly other
rare architectures.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Closes: #1275
Approved by: cgwalters
This commit is contained in:
Simon McVittie 2017-10-16 12:51:04 +01:00 committed by Atomic Bot
parent 9503189362
commit a4723dafed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ostree/ot-builtin-create-usb.c
View File

@ -113,7 +113,7 @@ ostree_builtin_create_usb (int argc,
OstreeRepoMode mode = OSTREE_REPO_MODE_BARE_USER; OstreeRepoMode mode = OSTREE_REPO_MODE_BARE_USER;
if (TEMP_FAILURE_RETRY (fgetxattr (mount_root_dfd, "user.test", NULL, 0)) < 0 && if (TEMP_FAILURE_RETRY (fgetxattr (mount_root_dfd, "user.test", NULL, 0)) < 0 &&
errno == ENOTSUP) (errno == ENOTSUP || errno == EOPNOTSUPP))
mode = OSTREE_REPO_MODE_ARCHIVE; mode = OSTREE_REPO_MODE_ARCHIVE;
g_debug ("%s: Creating repository in mode %u", G_STRFUNC, mode); g_debug ("%s: Creating repository in mode %u", G_STRFUNC, mode);

10
tests/libostreetest.c
View File

@ -85,8 +85,10 @@ ot_check_relabeling (gboolean *can_relabel,
g_autoptr(GBytes) bytes = glnx_fgetxattr_bytes (tmpf.fd, "security.selinux", &local_error); g_autoptr(GBytes) bytes = glnx_fgetxattr_bytes (tmpf.fd, "security.selinux", &local_error);
if (!bytes) if (!bytes)
{ {
/* libglnx preserves errno */ /* libglnx preserves errno. The EOPNOTSUPP case can't be part of a
if (G_IN_SET (errno, ENOTSUP, ENODATA)) * 'case' statement because on most but not all architectures,
* it's numerically equal to ENOTSUP. */
if (G_IN_SET (errno, ENOTSUP, ENODATA) || errno == EOPNOTSUPP)
{ {
*can_relabel = FALSE; *can_relabel = FALSE;
return TRUE; return TRUE;
@ -99,7 +101,7 @@ ot_check_relabeling (gboolean *can_relabel,
const guint8 *data = g_bytes_get_data (bytes, &data_len); const guint8 *data = g_bytes_get_data (bytes, &data_len);
if (fsetxattr (tmpf.fd, "security.selinux", data, data_len, 0) < 0) if (fsetxattr (tmpf.fd, "security.selinux", data, data_len, 0) < 0)
{ {
if (errno == ENOTSUP) if (errno == ENOTSUP || errno == EOPNOTSUPP)
{ {
*can_relabel = FALSE; *can_relabel = FALSE;
return TRUE; return TRUE;
@ -122,7 +124,7 @@ ot_check_user_xattrs (gboolean *has_user_xattrs,
if (fsetxattr (tmpf.fd, "user.test", "novalue", strlen ("novalue"), 0) < 0) if (fsetxattr (tmpf.fd, "user.test", "novalue", strlen ("novalue"), 0) < 0)
{ {
if (errno == ENOTSUP) if (errno == ENOTSUP || errno == EOPNOTSUPP)
{ {
*has_user_xattrs = FALSE; *has_user_xattrs = FALSE;
return TRUE; return TRUE;