From 91345610f82ae5c637f58a16388fbab3c425d753 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Tue, 23 Mar 2010 14:43:18 +0000 Subject: Strictly require libudev if udev_sync is used. This prevents some confusion when libudev was not found so udev_sync was disabled automatically. Configure was successful though giving only a tiny warning. Also, if "dmsetup udevcreatecookie" is used, never return 0x000000 as a result if udev is not running and keep the output blank. --- tools/lvmcmdline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/lvmcmdline.c') diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 69e2c873..fea9b278 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -42,7 +42,7 @@ extern char *optarg; # define OPTIND_INIT 1 #endif -#ifdef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE +#ifdef UDEV_SYNC_SUPPORT # define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE # include #endif @@ -919,7 +919,7 @@ static void _apply_settings(struct cmd_context *cmd) static int _set_udev_checking(struct cmd_context *cmd) { -#ifdef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE +#ifdef UDEV_SYNC struct udev *udev; const char *udev_dev_dir; size_t udev_dev_dir_len; -- cgit