From 1dc359f119a67968b961cbc7f4ffba479c65dc1759b4d44453467ae95d49fae7 Mon Sep 17 00:00:00 2001 From: heming zhao Date: Wed, 30 Mar 2022 08:25:57 +0000 Subject: [PATCH] Accepting request 965834 from home:hmzhao:branches:openSUSE:Factory - lvm2-monitor.service must be started after sysinit.target (bsc#1197183) + 0025-vgchange-monitor-don-t-use-udev-info.patch OBS-URL: https://build.opensuse.org/request/show/965834 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=309 --- ...vgchange-monitor-don-t-use-udev-info.patch | 36 +++++++++++++++++++ lvm2.changes | 6 ++++ lvm2.spec | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 0025-vgchange-monitor-don-t-use-udev-info.patch diff --git a/0025-vgchange-monitor-don-t-use-udev-info.patch b/0025-vgchange-monitor-don-t-use-udev-info.patch new file mode 100644 index 0000000..8d219e3 --- /dev/null +++ b/0025-vgchange-monitor-don-t-use-udev-info.patch @@ -0,0 +1,36 @@ +From 72f0b637d239c893ca49b05b83e2ebddc327e900 Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Fri, 25 Mar 2022 14:13:56 -0500 +Subject: [PATCH] vgchange monitor: don't use udev info + +vgchange --monitor y is run during startup when udev is being +initialized and is not yet ready to be used. +--- + tools/vgchange.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/tools/vgchange.c b/tools/vgchange.c +index fc076c1d56ba..09ade96a60e6 100644 +--- a/tools/vgchange.c ++++ b/tools/vgchange.c +@@ -992,6 +992,17 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) + return ECMD_PROCESSED; + } + ++ /* ++ * Do not use udev for device listing or device info because ++ * vgchange --monitor y is called during boot when udev is being ++ * initialized and is not yet ready to be used. ++ */ ++ if (arg_is_set(cmd, monitor_ARG) && ++ arg_int_value(cmd, monitor_ARG, DEFAULT_DMEVENTD_MONITOR)) { ++ init_obtain_device_list_from_udev(0); ++ init_external_device_info_source(DEV_EXT_NONE); ++ } ++ + if (update) + flags |= READ_FOR_UPDATE; + else if (arg_is_set(cmd, activate_ARG)) +-- +2.34.1 + diff --git a/lvm2.changes b/lvm2.changes index b6518a0..a3ae916 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 30 10:11:00 UTC 2022 - Heming Zhao + +- lvm2-monitor.service must be started after sysinit.target (bsc#1197183) + + 0025-vgchange-monitor-don-t-use-udev-info.patch + ------------------------------------------------------------------- Thu Mar 10 01:25:00 UTC 2022 - Heming Zhao diff --git a/lvm2.spec b/lvm2.spec index cbc2770..68e8c63 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -87,6 +87,7 @@ Patch0021: 0021-devices-use-dev-cache-aliases-handling-from-label-sc.patch Patch0022: 0022-devices-only-close-PVs-on-LVs-when-scan_lvs-is-enabl.patch Patch0023: 0023-writecache-check-memory-usage.patch Patch0024: 0024-pvscan-don-t-use-udev-for-external-device-info.patch +Patch0025: 0025-vgchange-monitor-don-t-use-udev-info.patch # SUSE patches: 1000+ for LVM # Never upstream Patch1001: cmirrord_remove_date_time_from_compilation.patch @@ -170,6 +171,7 @@ Volume Manager. %patch0022 -p1 %patch0023 -p1 %patch0024 -p1 +%patch0025 -p1 %patch1001 -p1 %patch1002 -p1 %patch1003 -p1