diff --git a/Makefile b/Makefile index 0977f27..188a218 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,7 @@ MDMON_DIR = $(RUN_DIR) # place for autoreplace cookies FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots SYSTEMD_DIR=/lib/systemd/system +LIB_DIR=/usr/libexec/mdadm COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC) DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM) @@ -280,7 +281,7 @@ install-systemd: systemd/mdmon@.service $(INSTALL) -D -m 755 .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ rm -f .install.tmp.3; \ done - if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(SYSTEMD_DIR)/../scripts/mdadm_env.sh ;fi + if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi uninstall: rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service index c7cff3e..46f7b88 100644 --- a/systemd/mdmonitor.service +++ b/systemd/mdmonitor.service @@ -12,5 +12,5 @@ DefaultDependencies=no [Service] Environment= MDADM_MONITOR_ARGS=--scan EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh +ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS