From ebee474c08d6219b0a0ff88139ce0aabf3ec529c Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 3 Aug 2021 13:21:11 -0400 Subject: sys-fs/udev: adjust test logic Check EUID instead of FEATURES=userpriv. It is possible the ebuild is executing as some other user, regardless of the userpriv feature. Drop the usersandbox check: this is only relevant if the ebuild phase is running as a non-root user, and we already handle that with the EUID check. Signed-off-by: Mike Gilbert --- sys-fs/udev/udev-249-r2.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sys-fs') diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild index e2c3e613c5e6..d22a44bf678d 100644 --- a/sys-fs/udev/udev-249-r2.ebuild +++ b/sys-fs/udev/udev-249-r2.ebuild @@ -199,14 +199,9 @@ multilib_src_test() { # udev calls 'mknod' a number of times, and this interacts # badly with kernel namespaces. - if has userpriv ${FEATURES}; then - ewarn "\'FEATURES=userpriv\' detected" + if [[ ${EUID} -ne 0 ]]; then ewarn "udev tests need to run under uid 0" ewarn "Skipping tests" - elif has usersandbox ${FEATURES}; then - ewarn "\'FEATURES=usersandbox\' detected" - ewarn "udev tests needs full access to /dev" - ewarn "Skipping tests" elif has sandbox ${FEATURES}; then ewarn "\'FEATURES=sandbox\' detected" ewarn "udev tests needs full access to /dev" -- cgit v1.2.3-65-gdbad