From b5dbb3bd65642516a773a2cdf67efe977cfec4b4 Mon Sep 17 00:00:00 2001 Message-Id: From: Michal Privoznik Date: Thu, 27 Jun 2019 15:55:37 +0200 Subject: [PATCH] lib: Drop UDEVSETTLE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The udevsettle binary is no longer used anywhere as it was replaced by 'udevadm settle'. There's no reason for us to even check for it in configure. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko (cherry picked from commit 2944dcb2de014a881c3539a43f989c2a723e87ca) https://bugzilla.redhat.com/show_bug.cgi?id=1710575 Signed-off-by: Michal Privoznik Message-Id: Reviewed-by: Ján Tomko --- m4/virt-external-programs.m4 | 5 ----- src/util/virutil.c | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index ab6149288f..3c915e1a65 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -46,7 +46,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ AC_PATH_PROG([RADVD], [radvd], [radvd], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([TC], [tc], [tc], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([UDEVADM], [udevadm], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) @@ -71,10 +70,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"], [Location or name of the udevadm program]) fi - if test -n "$UDEVSETTLE"; then - AC_DEFINE_UNQUOTED([UDEVSETTLE], ["$UDEVSETTLE"], - [Location or name of the udevsettle program]) - fi if test -n "$MODPROBE"; then AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"], [Location or name of the modprobe program]) diff --git a/src/util/virutil.c b/src/util/virutil.c index d37c1ac632..68d3217248 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1621,14 +1621,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, #endif -#if defined(UDEVADM) || defined(UDEVSETTLE) +#if defined(UDEVADM) void virWaitForDevices(void) { -# ifdef UDEVADM const char *const settleprog[] = { UDEVADM, "settle", NULL }; -# else - const char *const settleprog[] = { UDEVSETTLE, NULL }; -# endif int exitstatus; if (access(settleprog[0], X_OK) != 0) -- 2.22.0