Skip to content

Commit 2a66c58

Browse files
committed
TEMP HACK use device-mapper-multipath/lvm2 not XS forks
1 parent 7549c76 commit 2a66c58

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

SPECS/sm.spec

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ Requires(post): systemd
2525
Requires(preun): systemd
2626
Requires(postun): systemd
2727
Requires: sm-fairlock = %{version}-%{release}
28-
Requires: xenserver-multipath
29-
Requires(post): xenserver-multipath
30-
Requires: xenserver-lvm2 >= 2.02.180-11.xs+2.0.2
28+
29+
# YD: see later if that makes any sense
30+
Requires: device-mapper-multipath
31+
Requires(post): device-mapper-multipath
32+
Requires: lvm2
33+
#Requires: xenserver-multipath
34+
#Requires(post): xenserver-multipath
35+
#Requires: xenserver-lvm2 >= 2.02.180-11.xs+2.0.2
36+
3137
Obsoletes: lvm2-sm-config <= 7:2.02.180-15.xs8
3238
Requires: python3-bitarray
3339
Requires(post): xs-presets >= 1.3
@@ -175,13 +181,13 @@ systemctl start sr_health_check.timer
175181
# # However it won't start without linstor-controller.service
176182
# systemctl enable linstor-monitor.service
177183

178-
# XCP-ng: We must reload the multipathd configuration without restarting the service to prevent
179-
# the opening of /dev/drbdXXXX volumes. Otherwise if multipathd opens a DRBD volume,
180-
# it blocks its access to other hosts.
181-
# This command is also important if our multipath conf is modified for other drivers.
182-
if [ $1 -gt 1 ]; then
183-
multipathd reconfigure
184-
fi
184+
# # XCP-ng: We must reload the multipathd configuration without restarting the service to prevent
185+
# # the opening of /dev/drbdXXXX volumes. Otherwise if multipathd opens a DRBD volume,
186+
# # it blocks its access to other hosts.
187+
# # This command is also important if our multipath conf is modified for other drivers.
188+
# if [ $1 -gt 1 ]; then
189+
# multipathd reconfigure
190+
# fi
185191

186192
%preun
187193
%systemd_preun make-dummy-sr.service
@@ -511,6 +517,8 @@ fi
511517
- Dropped all XS patches, assumed all integrated upstream
512518
- Skipped all XCP-ng patches for now
513519
- New patch: install relative symlinks
520+
- TEMP HACK remove dependency on device-mapper-multipath, which needs work
521+
- TEMP HACK depend on lvm2 not xenserver-lvm2, which needs work
514522

515523
* Thu Jul 10 2025 Yann Dirson <yann.dirson@vates.tech> - 3.2.12-8.0.ydi.1
516524
- Adjust deps for Almalinux 9

0 commit comments

Comments
 (0)