Skip to content

Commit 15e0bdb

Browse files
Tim SmithTimSmithCtx
authored andcommitted
CP-54434 Sync specfile
Signed-off-by: Tim Smith <tim.smith@cloud.com>
1 parent 304b1e5 commit 15e0bdb

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

mk/sm.spec.in

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/
6767
# On upgrade, migrate from the old statefile to the new statefile so that
6868
# storage is not reinitialized.
6969
if [ $1 -gt 1 ] ; then
70-
grep -q ^success /etc/firstboot.d/state/10-prepare-storage 2>/dev/null && touch /var/lib/misc/ran-storage-init || :
70+
grep -q ^success "%{_sysconfdir}/firstboot.d/state/10-prepare-storage" 2>/dev/null && touch /var/lib/misc/ran-storage-init || :
7171
fi
7272

73-
rm -f /etc/lvm/cache/.cache
74-
touch /etc/lvm/cache/.cache
73+
rm -f "%{_sysconfdir}/lvm/cache/.cache"
74+
touch "%{_sysconfdir}/lvm/cache/.cache"
7575

7676
systemctl enable sr_health_check.timer
7777
systemctl start sr_health_check.timer
@@ -104,16 +104,16 @@ tests/run_python_unittests.sh
104104
%{_libexecdir}/sm
105105
%exclude %{_libexecdir}/sm/debug
106106
%exclude %{_libexecdir}/sm/plugins/keymanagerutil.py
107-
/etc/udev/scripts/xs-mpath-scsidev.sh
108-
/etc/xapi.d/plugins/coalesce-leaf
109-
/etc/xapi.d/plugins/lvhd-thin
110-
/etc/xapi.d/plugins/nfs-on-slave
111-
/etc/xapi.d/plugins/on-slave
112-
/etc/xapi.d/plugins/tapdisk-pause
113-
/etc/xapi.d/plugins/testing-hooks
114-
/etc/xapi.d/plugins/intellicache-clean
115-
/etc/xapi.d/plugins/trim
116-
/etc/xapi.d/xapi-pre-shutdown/*
107+
%{_sysconfdir}/udev/scripts/xs-mpath-scsidev.sh
108+
%{_sysconfdir}/xapi.d/plugins/coalesce-leaf
109+
%{_sysconfdir}/xapi.d/plugins/lvhd-thin
110+
%{_sysconfdir}/xapi.d/plugins/nfs-on-slave
111+
%{_sysconfdir}/xapi.d/plugins/on-slave
112+
%{_sysconfdir}/xapi.d/plugins/tapdisk-pause
113+
%{_sysconfdir}/xapi.d/plugins/testing-hooks
114+
%{_sysconfdir}/xapi.d/plugins/intellicache-clean
115+
%{_sysconfdir}/xapi.d/plugins/trim
116+
%{_sysconfdir}/xapi.d/xapi-pre-shutdown/*
117117
%{_bindir}/mpathutil
118118
%{_bindir}/blktap2
119119
%{_bindir}/tapdisk-cache-stats
@@ -128,14 +128,14 @@ tests/run_python_unittests.sh
128128
%{_unitdir}/sr_health_check.timer
129129
%{_unitdir}/sr_health_check.service
130130
%{_unitdir}/SMGC@.service
131-
%config /etc/udev/rules.d/65-multipath.rules
132-
%config /etc/udev/rules.d/55-xs-mpath-scsidev.rules
133-
%config /etc/udev/rules.d/58-xapi.rules
134-
%dir /etc/multipath/conf.d
135-
%config(noreplace) /etc/multipath/conf.d/custom.conf
136-
%config /etc/logrotate.d/SMlog
137-
%config /etc/udev/rules.d/57-usb.rules
138-
%config /etc/udev/rules.d/99-purestorage.rules
131+
%config %{_sysconfdir}/udev/rules.d/65-multipath.rules
132+
%config %{_sysconfdir}/udev/rules.d/55-xs-mpath-scsidev.rules
133+
%config %{_sysconfdir}/udev/rules.d/58-xapi.rules
134+
%dir %{_sysconfdir}/multipath/conf.d
135+
%config(noreplace) %{_sysconfdir}/multipath/conf.d/custom.conf
136+
%config %{_sysconfdir}/logrotate.d/SMlog
137+
%config %{_sysconfdir}/udev/rules.d/57-usb.rules
138+
%config %{_sysconfdir}/udev/rules.d/99-purestorage.rules
139139
%doc CONTRIB LICENSE MAINTAINERS README.md
140140

141141
%package fairlock
@@ -203,7 +203,7 @@ callers which expect to find python files in /opt/xensource
203203
/opt/xensource/sm
204204
/opt/xensource/bin/blktap2
205205
/opt/xensource/bin/tapdisk-cache-stats
206-
/etc/xensource/master.d/02-vhdcleanup
206+
%{_sysconfdir}/xensource/master.d/02-vhdcleanup
207207
/opt/xensource/libexec/check-device-sharing
208208
/opt/xensource/libexec/local-device-change
209209
/opt/xensource/libexec/make-dummy-sr

0 commit comments

Comments
 (0)