Skip to content

Commit 6a2bcce

Browse files
committedMar 20, 2025·
CP-52793: remove sm-multipath, moved to host-installer
This script was only ever used by the host-installer when setting up boot from SAN environments and this necessitated SM being included in the install image for this one file. By moving this functionality into the host-installer where it belongs we reduce the required dependencies and size of the install image. Signed-off-by: Mark Syms <mark.syms@cloud.com>
1 parent 0ba8e1c commit 6a2bcce

File tree

3 files changed

+0
-170
lines changed

3 files changed

+0
-170
lines changed
 

‎Makefile

-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ SM_LIBS += cbtutil
6060
SM_LIBS += sr_health_check
6161

6262
UDEV_RULES = 65-multipath 55-xs-mpath-scsidev 57-usb 58-xapi 99-purestorage
63-
MPATH_DAEMON = sm-multipath
6463
MPATH_CUSTOM_CONF = custom.conf
6564
SMLOG_CONF = SMlog
6665

@@ -138,8 +137,6 @@ install: precheck
138137
$(SM_STAGING)$(SM_DEST)/plugins/
139138
install -m 644 multipath/$(MPATH_CUSTOM_CONF) \
140139
$(SM_STAGING)/$(MPATH_CUSTOM_CONF_DIR)
141-
install -m 755 multipath/sm-multipath \
142-
$(SM_STAGING)/$(INIT_DIR)
143140
install -m 755 multipath/multipath-root-setup \
144141
$(SM_STAGING)/$(SM_DEST)
145142
install -m 644 etc/logrotate.d/$(SMLOG_CONF) \

‎mk/sm.spec.in

-7
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ make -C misc/fairlock
4040
make install DESTDIR="%{buildroot}"
4141
make -C misc/fairlock install DESTDIR="%{buildroot}"
4242

43-
%pre
44-
# Remove sm-multipath on install or upgrade, to ensure it goes
45-
[ ! -x /sbin/chkconfig ] || chkconfig --del sm-multipath || :
46-
4743
%post
4844
%systemd_post make-dummy-sr.service
4945
%systemd_post mpcount.service
@@ -88,8 +84,6 @@ update-alternatives --install /etc/multipath.conf multipath.conf /etc/multipath.
8884
%systemd_preun storage-init.service
8985
%systemd_preun usb-scan.socket
9086
%systemd_preun mpathcount.socket
91-
# Remove sm-multipath on upgrade or uninstall, to ensure it goes
92-
[ ! -x /sbin/chkconfig ] || chkconfig --del sm-multipath || :
9387
# only remove in case of erase (but not at upgrade)
9488
if [ $1 -eq 0 ] ; then
9589
update-alternatives --remove multipath.conf /etc/multipath.xenserver/multipath.conf
@@ -203,7 +197,6 @@ tests/run_python_unittests.sh
203197
%dir /opt/xensource/sm/plugins
204198
/opt/xensource/sm/plugins/__init__.py*
205199
/sbin/mpathutil
206-
/etc/rc.d/init.d/sm-multipath
207200
%{_unitdir}/make-dummy-sr.service
208201
%{_unitdir}/xs-sm.service
209202
%{_unitdir}/sm-mpath-root.service

‎multipath/sm-multipath

-160
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.