diff mbox series

[9/9] xfs_scrub_all.cron: move to package data directory

Message ID 170405001964.1800712.10514067731814883862.stgit@frogsfrogsfrogs (mailing list archive)
State New, archived
Headers show
Series [1/9] debian: install scrub services with dh_installsystemd | expand

Commit Message

Darrick J. Wong Dec. 31, 2023, 10:54 p.m. UTC 
From: Darrick J. Wong <djwong@kernel.org>

cron jobs don't belong in /usr/lib.  Since the cron job is also
secondary to the systemd timer, it's really only provided as a courtesy
for distributions that don't use systemd.  Move it to @datadir@, aka
/usr/share/xfsprogs.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 include/builddefs.in |    1 -
 scrub/Makefile       |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Neal Gompa Jan. 3, 2024, 2:01 a.m. UTC | #1 
On Tue, Jan 2, 2024 at 8:23 PM Darrick J. Wong <djwong@kernel.org> wrote:
>
> From: Darrick J. Wong <djwong@kernel.org>
>
> cron jobs don't belong in /usr/lib.  Since the cron job is also
> secondary to the systemd timer, it's really only provided as a courtesy
> for distributions that don't use systemd.  Move it to @datadir@, aka
> /usr/share/xfsprogs.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
>  include/builddefs.in |    1 -
>  scrub/Makefile       |    2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
>
>
> diff --git a/include/builddefs.in b/include/builddefs.in
> index 9d0f9c3bf7c..f5138b5098f 100644
> --- a/include/builddefs.in
> +++ b/include/builddefs.in
> @@ -51,7 +51,6 @@ PKG_SBIN_DIR  = @sbindir@
>  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
> diff --git a/scrub/Makefile b/scrub/Makefile
> index 8fb366c922c..472df48a720 100644
> --- a/scrub/Makefile
> +++ b/scrub/Makefile
> @@ -26,7 +26,7 @@ INSTALL_SCRUB += install-crond
>  CRONTABS = xfs_scrub_all.cron
>  OPTIONAL_TARGETS += $(CRONTABS)
>  # Don't enable the crontab by default for now
> -CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
> +CROND_DIR = $(PKG_DATA_DIR)
>  endif
>
>  endif  # scrub_prereqs
>
>

Looks good to me.

Reviewed-by: Neal Gompa <neal@gompa.dev>
Christoph Hellwig Jan. 5, 2024, 5:11 a.m. UTC | #2 
On Sun, Dec 31, 2023 at 02:54:41PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> cron jobs don't belong in /usr/lib.  Since the cron job is also
> secondary to the systemd timer, it's really only provided as a courtesy
> for distributions that don't use systemd.  Move it to @datadir@, aka
> /usr/share/xfsprogs.

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>
diff mbox series

Patch

diff --git a/include/builddefs.in b/include/builddefs.in
index 9d0f9c3bf7c..f5138b5098f 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -51,7 +51,6 @@  PKG_SBIN_DIR	= @sbindir@
 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
diff --git a/scrub/Makefile b/scrub/Makefile
index 8fb366c922c..472df48a720 100644
--- a/scrub/Makefile
+++ b/scrub/Makefile
@@ -26,7 +26,7 @@  INSTALL_SCRUB += install-crond
 CRONTABS = xfs_scrub_all.cron
 OPTIONAL_TARGETS += $(CRONTABS)
 # Don't enable the crontab by default for now
-CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
+CROND_DIR = $(PKG_DATA_DIR)
 endif
 
 endif	# scrub_prereqs