xfs_scrub_fail: move executable script to /usr/libexec

Per FHS 3.0, non-PATH executable binaries are supposed to live under
/usr/libexec, not /usr/lib.  xfs_scrub_fail is an executable script,
so move it to libexec in case some distro some day tries to mount
/usr/lib as noexec or something.

Link: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/include/builddefs.in b/include/builddefs.in
index 43025ba4fccc9ded8851d69b2a2c53fa3cdd16dc..32ede788ab26c4025acff6b3bad7c06581318073 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -52,6 +52,7 @@ PKG_ROOT_SBIN_DIR = @root_sbindir@
 PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@
 PKG_LIB_DIR    = @libdir@@libdirsuffix@
 PKG_LIB_SCRIPT_DIR     = @libdir@
+PKG_LIBEXEC_DIR        = @libexecdir@/@pkg_name@
 PKG_INC_DIR    = @includedir@/xfs
 DK_INC_DIR     = @includedir@/disk
 PKG_MAN_DIR    = @mandir@

diff --git a/scrub/Makefile b/scrub/Makefile
index 70bc0a5b319b04a747cf094d8bf67ad2b0d1ca40..1d2da3d845fd8cb1985cfd00dbcb0877310ae2ed 100644 (file)
--- a/scrub/Makefile
+++ b/scrub/Makefile
@@ -139,8 +139,7 @@ install: $(INSTALL_SCRUB)
        @echo "    [SED]    $@"
        $(Q)$(SED) -e "s|@sbindir@|$(PKG_SBIN_DIR)|g" \
                   -e "s|@scrub_args@|$(XFS_SCRUB_ARGS)|g" \
-                  -e "s|@pkg_lib_dir@|$(PKG_LIB_SCRIPT_DIR)|g" \
-                  -e "s|@pkg_name@|$(PKG_NAME)|g" \
+                  -e "s|@pkg_libexec_dir@|$(PKG_LIBEXEC_DIR)|g" \
                   < $< > $@
 
 %.cron: %.cron.in $(builddefs)
@@ -150,8 +149,8 @@ install: $(INSTALL_SCRUB)
 install-systemd: default $(SYSTEMD_SERVICES)
        $(INSTALL) -m 755 -d $(SYSTEMD_SYSTEM_UNIT_DIR)
        $(INSTALL) -m 644 $(SYSTEMD_SERVICES) $(SYSTEMD_SYSTEM_UNIT_DIR)
-       $(INSTALL) -m 755 -d $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
-       $(INSTALL) -m 755 $(XFS_SCRUB_FAIL_PROG) $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
+       $(INSTALL) -m 755 -d $(PKG_LIBEXEC_DIR)
+       $(INSTALL) -m 755 $(XFS_SCRUB_FAIL_PROG) $(PKG_LIBEXEC_DIR)
 
 install-crond: default $(CRONTABS)
        $(INSTALL) -m 755 -d $(CROND_DIR)

diff --git a/scrub/xfs_scrub_fail@.service.in b/scrub/xfs_scrub_fail@.service.in
index 49a3b08f48b2c68c2e223de5df580ebe8868f924..96a2ed5da31eb3e517d5425f7ca6f809dc2f1abb 100644 (file)
--- a/scrub/xfs_scrub_fail@.service.in
+++ b/scrub/xfs_scrub_fail@.service.in
@@ -10,7 +10,7 @@ Documentation=man:xfs_scrub(8)
 [Service]
 Type=oneshot
 Environment=EMAIL_ADDR=root
-ExecStart=@pkg_lib_dir@/@pkg_name@/xfs_scrub_fail "${EMAIL_ADDR}" %f
+ExecStart=@pkg_libexec_dir@/xfs_scrub_fail "${EMAIL_ADDR}" %f
 User=mail
 Group=mail
 SupplementaryGroups=systemd-journal