* [mdadm PATCH] Move mdadm_env.sh out of /usr/lib/systemd
@ 2017-10-05 6:13 NeilBrown
2017-10-10 20:45 ` Jes Sorensen
0 siblings, 1 reply; 2+ messages in thread
From: NeilBrown @ 2017-10-05 6:13 UTC (permalink / raw)
To: Jes.Sorensen; +Cc: Linux Raid
[-- Attachment #1: Type: text/plain, Size: 2012 bytes --]
The systemd developers like to keep control of the
lib/systemd namespace, and haven't approved of the use
of lib/systemd/scripts. So we should stop using it.
Move the mdadm_env.sh script, optionally sourced by
mdmonitor.service, to a new directory /usr/lib/mdadm.
Signed-off-by: NeilBrown <neilb@suse.com>
---
Makefile | 3 ++-
systemd/mdmonitor.service | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 0977f27d3750..188a21801fcc 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 c7cff3e497ec..46f7b8801354 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
--
2.14.0.rc0.dirty
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [mdadm PATCH] Move mdadm_env.sh out of /usr/lib/systemd
2017-10-05 6:13 [mdadm PATCH] Move mdadm_env.sh out of /usr/lib/systemd NeilBrown
@ 2017-10-10 20:45 ` Jes Sorensen
0 siblings, 0 replies; 2+ messages in thread
From: Jes Sorensen @ 2017-10-10 20:45 UTC (permalink / raw)
To: NeilBrown; +Cc: Linux Raid
On 10/05/2017 02:13 AM, NeilBrown wrote:
>
> The systemd developers like to keep control of the
> lib/systemd namespace, and haven't approved of the use
> of lib/systemd/scripts. So we should stop using it.
>
> Move the mdadm_env.sh script, optionally sourced by
> mdmonitor.service, to a new directory /usr/lib/mdadm.
>
> Signed-off-by: NeilBrown <neilb@suse.com>
Applied!
Thanks,
Jes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-10 20:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-05 6:13 [mdadm PATCH] Move mdadm_env.sh out of /usr/lib/systemd NeilBrown
2017-10-10 20:45 ` Jes Sorensen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.