pvscan: disable sleeping and retrying for udev

When systemd is running pvscans, udev may not be
entirely initialized, so the pvscan should not
sleep and retry waiting for udev info.

2 files changed, 13 insertions, 0 deletions

diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c
index eb99cf596..06855ff13 100644
--- a/lib/misc/lvm-globals.c
+++ b/lib/misc/lvm-globals.c
@@ -47,6 +47,7 @@ static int _ignore_lvm_mirrors = DEFAULT_IGNORE_LVM_MIRRORS;
 static int _error_message_produced = 0;
 static unsigned _is_static = 0;
 static int _udev_checking = 1;
+static int _udev_sleeping = 1;
 static int _retry_deactivation = DEFAULT_RETRY_DEACTIVATION;
 static int _activation_checks = 0;
 static char _sysfs_dir_path[PATH_MAX] = "";
@@ -186,6 +187,11 @@ void init_udev_checking(int checking)
 		log_debug_activation("LVM udev checking disabled");
 }
 
+void init_udev_sleeping(int sleeping)
+{
+	_udev_sleeping = sleeping;
+}
+
 void init_retry_deactivation(int retry)
 {
 	_retry_deactivation = retry;
@@ -353,6 +359,11 @@ int udev_checking(void)
 	return _udev_checking;
 }
 
+int udev_sleeping(void)
+{
+	return _udev_sleeping;
+}
+
 int retry_deactivation(void)
 {
 	return _retry_deactivation;
diff --git a/lib/misc/lvm-globals.h b/lib/misc/lvm-globals.h
index 921ae7ebe..a54001c6b 100644
--- a/lib/misc/lvm-globals.h
+++ b/lib/misc/lvm-globals.h
@@ -46,6 +46,7 @@ void init_ignore_lvm_mirrors(int scan);
 void init_error_message_produced(int produced);
 void init_is_static(unsigned value);
 void init_udev_checking(int checking);
+void init_udev_sleeping(int sleeping);
 void init_pv_min_size(uint64_t sectors);
 void init_activation_checks(int checks);
 void init_retry_deactivation(int retry);
@@ -77,6 +78,7 @@ const char *log_command_info(void);
 const char *log_command_file(void);
 unsigned is_static(void);
 int udev_checking(void);
+int udev_sleeping(void);
 const char *sysfs_dir_path(void);
 uint64_t pv_min_size(void);
 int activation_checks(void);