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