From 9210fd5beb9c7163766f55de19eb9fe435aec13c Mon Sep 17 00:00:00 2001 From: Aniruddha Basak Date: Fri, 3 Sep 2021 00:40:57 +0530 Subject: [PATCH] mdadm: migrate cron.weekly to systemd.timer (#1244) Add mdadm timer and service files and remove the unused weekly cron --- .../coreos-overlay/sys-fs/mdadm/files/mdadm.service | 6 ++++++ .../coreos-overlay/sys-fs/mdadm/files/mdadm.timer | 9 +++++++++ .../coreos-overlay/sys-fs/mdadm/files/mdadm.weekly | 5 ----- .../coreos-overlay/sys-fs/mdadm/mdadm-4.1.ebuild | 6 ++++-- 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.service create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.timer delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.weekly diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.service b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.service new file mode 100644 index 0000000000..182c97310b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.service @@ -0,0 +1,6 @@ +[Unit] +Description=Initiates a check run of an MD array's redundancy information. + +[Service] +Type=oneshot +ExecStart=/usr/sbin/checkarray --cron --all --idle --quiet diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.timer b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.timer new file mode 100644 index 0000000000..ad1a52d828 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Weekly check for MD array's redundancy information. + +[Install] +WantedBy=timers.target + +[Timer] +OnCalendar=weekly +Persistent=true diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.weekly b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.weekly deleted file mode 100644 index e2b35b550f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/files/mdadm.weekly +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# This requires that AUTOCHECK is true in /etc/default/mdadm -if [ -x /usr/sbin/checkarray ] && [ $(date +\%d) -le 7 ]; then - /usr/sbin/checkarray --cron --all --idle --quiet -fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.1.ebuild index 007a2b8f42..c9655c39ce 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/mdadm/mdadm-4.1.ebuild @@ -78,8 +78,10 @@ src_install() { insinto /etc/default newins "${FILESDIR}"/etc-default-mdadm mdadm - exeinto /etc/cron.weekly - newexe "${FILESDIR}"/mdadm.weekly mdadm + systemd_dounit "${FILESDIR}"/mdadm.service + systemd_dounit "${FILESDIR}"/mdadm.timer + + systemd_enable_service timers.target mdadm.timer } pkg_postinst() {