On Sun, Dec 31, 2023 at 5:54 PM Darrick J. Wong <djwong@xxxxxxxxxx> wrote: > > From: Darrick J. Wong <djwong@xxxxxxxxxx> > > 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. > > Cc: Neal Gompa <neal@xxxxxxxxx> > Link: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> > --- > include/builddefs.in | 1 + > scrub/Makefile | 7 +++---- > scrub/xfs_scrub_fail@xxxxxxxxxxx | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > > diff --git a/include/builddefs.in b/include/builddefs.in > index eb7f6ba4f03..9d0f9c3bf7c 100644 > --- 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 fd47b893956..8fb366c922c 100644 > --- a/scrub/Makefile > +++ b/scrub/Makefile > @@ -140,8 +140,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) > @@ -151,8 +150,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@xxxxxxxxxxx b/scrub/xfs_scrub_fail@xxxxxxxxxxx > index 048b5732459..48a0f25b5f1 100644 > --- a/scrub/xfs_scrub_fail@xxxxxxxxxxx > +++ b/scrub/xfs_scrub_fail@xxxxxxxxxxx > @@ -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 > Looks great to me. Reviewed-by: Neal Gompa <neal@xxxxxxxxx> -- 真実はいつも一つ！/ Always, there's only one truth!
