29402fa850
- Update to 9.25.0 (PED-5842) OBS-URL: https://build.opensuse.org/request/show/1109376 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=132
48 lines
2.2 KiB
Diff
48 lines
2.2 KiB
Diff
Fix rpmlint Errors:
|
|
1. non-executable-script /usr/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh 644 /bin/bash
|
|
2. filelist-forbidden-bashcomp-userdirs /etc/bash_completion.d/drbdadm.sh
|
|
3. dir-or-file-in-run /run/drbd
|
|
|
|
diff -Naur drbd-utils-9.19.0.orig/scripts/drbdadm.bash_completion drbd-utils-9.19.0/scripts/drbdadm.bash_completion
|
|
--- drbd-utils-9.19.0.orig/scripts/drbdadm.bash_completion 2021-10-11 18:44:02.906467704 +0800
|
|
+++ drbd-utils-9.19.0/scripts/drbdadm.bash_completion 2021-10-11 18:48:24.653422443 +0800
|
|
@@ -1,5 +1,5 @@
|
|
#
|
|
-# /etc/bash_completion.d/drbdadm
|
|
+# /usr/share/bash-completion/completions/drbdadm
|
|
#
|
|
# Bash completion for the DRBD top-level management application, drbdadm.
|
|
#
|
|
diff -Naur drbd-utils-9.19.0.orig/scripts/Makefile.in drbd-utils-9.19.0/scripts/Makefile.in
|
|
--- drbd-utils-9.19.0.orig/scripts/Makefile.in 2021-10-11 18:44:02.906467704 +0800
|
|
+++ drbd-utils-9.19.0/scripts/Makefile.in 2021-10-11 18:51:21.716712860 +0800
|
|
@@ -147,7 +147,7 @@
|
|
mkdir -p $(DESTDIR)/usr/lib/ocf/resource.d/linbit
|
|
install -m 755 drbd.ocf $(DESTDIR)/usr/lib/ocf/resource.d/linbit/drbd
|
|
install -m 755 drbd-attr $(DESTDIR)/usr/lib/ocf/resource.d/linbit/drbd-attr
|
|
- install -m 644 drbd.shellfuncs.sh $(DESTDIR)/usr/lib/ocf/resource.d/linbit/
|
|
+ install -m 755 drbd.shellfuncs.sh $(DESTDIR)/usr/lib/ocf/resource.d/linbit/
|
|
endif
|
|
|
|
install-rgmanager:
|
|
@@ -173,8 +173,8 @@
|
|
|
|
install-bashcompletion:
|
|
ifeq ($(WITH_BASHCOMPLETION),yes)
|
|
- mkdir -p $(DESTDIR)$(sysconfdir)/bash_completion.d
|
|
- install -m 644 drbdadm.bash_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/drbdadm$(BASH_COMPLETION_SUFFIX)
|
|
+ mkdir -p $(DESTDIR)$(datadir)/bash-completion/completions
|
|
+ install -m 644 drbdadm.bash_completion $(DESTDIR)$(datadir)/bash-completion/completions/drbdadm
|
|
endif
|
|
|
|
clean:
|
|
@@ -195,7 +195,7 @@
|
|
rm -f $(DESTDIR)$(sysconfdir)/ha.d/resource.d/drbddisk
|
|
rm -f $(DESTDIR)$(sysconfdir)/ha.d/resource.d/drbdupper
|
|
rm -f $(DESTDIR)$(sysconfdir)/xen/scripts/block-drbd
|
|
- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/drbdadm$(BASH_COMPLETION_SUFFIX)
|
|
+ rm -f $(DESTDIR)$(datadir)/bash-completion/completions/drbdadm
|
|
! test -L $(DESTDIR)/sbin/rcdrbd || rm $(DESTDIR)/sbin/rcdrbd
|
|
|
|
.PHONY: install uninstall clean distclean
|