This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master
in repository gfs2-utils.
commit 6284d686590836ab2439a3c778559fa1188426aa
Author: Andrew Price <anprice(a)redhat.com>
Date: Thu Aug 2 11:03:05 2018 +0100
scripts: Install gfs2_withdraw_helper into $libexecdir
This is a more appropriate location as the helper script isn't meant to
be run by users. It also means that various checkers will stop
complaining that there is no man page for this script.
The 82-gfs2-withdraw.rules udev hook is now generated from the .in file
so that $libexecdir can be substituted into it. The path can be set at
configure time.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/scripts/82-gfs2-withdraw.rules | 2 --
gfs2/scripts/82-gfs2-withdraw.rules.in | 2 ++
gfs2/scripts/Makefile.am | 11 +++++++++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/gfs2/scripts/82-gfs2-withdraw.rules b/gfs2/scripts/82-gfs2-withdraw.rules
deleted file mode 100644
index 2c9e0e8..0000000
--- a/gfs2/scripts/82-gfs2-withdraw.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBSYSTEM=="gfs2", ACTION=="offline", RUN+="/bin/sh
/usr/sbin/gfs2_withdraw_helper"
-
diff --git a/gfs2/scripts/82-gfs2-withdraw.rules.in
b/gfs2/scripts/82-gfs2-withdraw.rules.in
new file mode 100644
index 0000000..00b30ac
--- /dev/null
+++ b/gfs2/scripts/82-gfs2-withdraw.rules.in
@@ -0,0 +1,2 @@
+SUBSYSTEM=="gfs2", ACTION=="offline", RUN+="/bin/sh
@libexecdir@/gfs2_withdraw_helper"
+
diff --git a/gfs2/scripts/Makefile.am b/gfs2/scripts/Makefile.am
index d4bda04..47c2966 100644
--- a/gfs2/scripts/Makefile.am
+++ b/gfs2/scripts/Makefile.am
@@ -1,10 +1,17 @@
MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES = 82-gfs2-withdraw.rules
+EXTRA_DIST = 82-gfs2-withdraw.rules.in
dist_sbin_SCRIPTS = \
gfs2_lockcapture \
- gfs2_trace \
+ gfs2_trace
+
+dist_libexec_SCRIPTS = \
gfs2_withdraw_helper
+82-gfs2-withdraw.rules: 82-gfs2-withdraw.rules.in
+ sed -e 's,[@]libexecdir[@],$(libexecdir),g' $< > $@
+
udevrulesdir=@udevdir(a)/rules.d
-dist_udevrules_DATA = \
+udevrules_DATA = \
82-gfs2-withdraw.rules
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
Show replies by date