From 006d8cd0a2fbd02ef37b9f81bc8cfa12f3e6d600 Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Tue, 18 Feb 2025 11:09:37 +0100 Subject: [PATCH 1/3] Create delay.timer.in Add delay.timer file that delays the trigger by 5 minutes. --- contrib/systemd/delay.timer.in | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 contrib/systemd/delay.timer.in diff --git a/contrib/systemd/delay.timer.in b/contrib/systemd/delay.timer.in new file mode 100644 index 0000000..ff1dbe7 --- /dev/null +++ b/contrib/systemd/delay.timer.in @@ -0,0 +1,3 @@ +[Timer] +OnBootSec=5m +Persistent=no From 53ea4efe5bc9beeff5726cef06226a96cd209a72 Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Tue, 18 Feb 2025 11:16:11 +0100 Subject: [PATCH 2/3] [makefile] add delay.timer to install Add the delay.timer to Makefile and install it to /etc/systemd/system/btrbk.timer.d/ so it's used when the timer is active. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index a8bc83d..10210fc 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ BINDIR = $(PREFIX)/bin DOCDIR = $(PREFIX)/share/doc/$(PN) SCRIPTDIR = $(PREFIX)/share/$(PN)/scripts SYSTEMDDIR = $(PREFIX)/lib/systemd/system +TIMERCONF = $(CONFDIR)/systemd/system/btrbk.timer.d BASHCOMPDIR = $(PREFIX)/share/bash-completion/completions MAN1DIR = $(PREFIX)/share/man/man1 MAN5DIR = $(PREFIX)/share/man/man5 @@ -79,12 +80,16 @@ install-completion: install-systemd: @echo 'installing systemd service units...' install -d -m 755 "$(DESTDIR)$(SYSTEMDDIR)" + install -d -m 755 "$(TIMERCONF)" $(replace_vars) contrib/systemd/btrbk.service.in > contrib/systemd/btrbk.service.tmp $(replace_vars) contrib/systemd/btrbk.timer.in > contrib/systemd/btrbk.timer.tmp + $(replace_vars) contrib/systemd/delay.timer.in > contrib/systemd/delay.timer.tmp install -p -m 644 contrib/systemd/btrbk.service.tmp "$(DESTDIR)$(SYSTEMDDIR)/btrbk.service" install -p -m 644 contrib/systemd/btrbk.timer.tmp "$(DESTDIR)$(SYSTEMDDIR)/btrbk.timer" + install -p -m 644 contrib/systemd/delay.timer.tmp "$(TIMERCONF)"/delay.timer" rm contrib/systemd/btrbk.service.tmp rm contrib/systemd/btrbk.timer.tmp + rm contrib/systemd/delay.timer.tmp install-share: @echo 'installing auxiliary scripts...' From cb4d0f38d01725f1584a5762f05454df92b344bc Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Tue, 18 Feb 2025 11:51:55 +0100 Subject: [PATCH 3/3] Fix delay.timer addition to Makefile Forgot some variables, so fix those up. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 10210fc..f7d850d 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ BINDIR = $(PREFIX)/bin DOCDIR = $(PREFIX)/share/doc/$(PN) SCRIPTDIR = $(PREFIX)/share/$(PN)/scripts SYSTEMDDIR = $(PREFIX)/lib/systemd/system -TIMERCONF = $(CONFDIR)/systemd/system/btrbk.timer.d +TIMERCONF = $(CONFDIR)/systemd/system BASHCOMPDIR = $(PREFIX)/share/bash-completion/completions MAN1DIR = $(PREFIX)/share/man/man1 MAN5DIR = $(PREFIX)/share/man/man5 @@ -45,6 +45,7 @@ replace_vars = sed \ -e "s|@DOCDIR@|$(DOCDIR)|g" \ -e "s|@SCRIPTDIR@|$(SCRIPTDIR)|g" \ -e "s|@SYSTEMDDIR@|$(SYSTEMDDIR)|g" \ + -e "s|@TIMERCONF@|$(TIMERCONF)|g" \ -e "s|@BASHCOMPDIR@|$(BASHCOMPDIR)|g" \ -e "s|@MAN1DIR@|$(MAN1DIR)|g" \ -e "s|@MAN5DIR@|$(MAN5DIR)|g" @@ -80,16 +81,16 @@ install-completion: install-systemd: @echo 'installing systemd service units...' install -d -m 755 "$(DESTDIR)$(SYSTEMDDIR)" - install -d -m 755 "$(TIMERCONF)" + install -d -m 755 "$(DESTDIR)$(TIMERCONF)/btrbk.timer.d" $(replace_vars) contrib/systemd/btrbk.service.in > contrib/systemd/btrbk.service.tmp $(replace_vars) contrib/systemd/btrbk.timer.in > contrib/systemd/btrbk.timer.tmp - $(replace_vars) contrib/systemd/delay.timer.in > contrib/systemd/delay.timer.tmp + $(replace_vars) contrib/systemd/delay.timer.in > contrib/systemd/delay.timer.tmp install -p -m 644 contrib/systemd/btrbk.service.tmp "$(DESTDIR)$(SYSTEMDDIR)/btrbk.service" install -p -m 644 contrib/systemd/btrbk.timer.tmp "$(DESTDIR)$(SYSTEMDDIR)/btrbk.timer" - install -p -m 644 contrib/systemd/delay.timer.tmp "$(TIMERCONF)"/delay.timer" + install -p -m 644 contrib/systemd/delay.timer.tmp "$(DESTDIR)$(TIMERCONF)/btrbk.timer.d/delay.timer" rm contrib/systemd/btrbk.service.tmp rm contrib/systemd/btrbk.timer.tmp - rm contrib/systemd/delay.timer.tmp + rm contrib/systemd/delay.timer.tmp install-share: @echo 'installing auxiliary scripts...'