diff -Nru mdadm-4.1/debian/changelog mdadm-4.1/debian/changelog --- mdadm-4.1/debian/changelog 2020-09-24 11:54:15.000000000 +0000 +++ mdadm-4.1/debian/changelog 2020-09-28 16:29:11.000000000 +0000 @@ -1,3 +1,10 @@ +mdadm (4.1-5ubuntu1.2) focal; urgency=medium + + * d/p/mdcheck-when-mdcheck-start-is-enabled-mdcheck-continue-too.patch: + - When mdcheck_start is enabled, enable mdcheck_continue too. + + -- Eric Desrochers Mon, 28 Sep 2020 12:29:11 -0400 + mdadm (4.1-5ubuntu1.1) focal; urgency=medium * d/rules: Install misc/mdcheck (LP: #1852747) diff -Nru mdadm-4.1/debian/patches/mdcheck-when-mdcheck-start-is-enabled-mdcheck-continue-too.patch mdadm-4.1/debian/patches/mdcheck-when-mdcheck-start-is-enabled-mdcheck-continue-too.patch --- mdadm-4.1/debian/patches/mdcheck-when-mdcheck-start-is-enabled-mdcheck-continue-too.patch 1970-01-01 00:00:00.000000000 +0000 +++ mdadm-4.1/debian/patches/mdcheck-when-mdcheck-start-is-enabled-mdcheck-continue-too.patch 2020-09-28 16:29:11.000000000 +0000 @@ -0,0 +1,32 @@ +Description: mdcheck: when mdcheck_start is enabled, enable mdcheck_continue too. + mdcheck_continue continues a regular array scan that was started by + mdcheck_start. + mdcheck_start will ensure that mdcheck_continue is active. + Howver if you reboot after a check has started, but before it finishes, + then mdcheck_continue won't cause it to continue, because nothing + starts it on boot. + + So add an install option for mdcheck_contine, and make sure it + gets enabled when mdcheck_start is enabled. + +Author: NeilBrown +Origin: backport, https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=6636788aaf4ec0cacaefb6e77592e4a68e70a957 +Bug-Ubuntu: https://launchpad.net/bugs/1852747 +--- a/systemd/mdcheck_continue.timer ++++ b/systemd/mdcheck_continue.timer +@@ -12,3 +12,6 @@ + OnCalendar=daily + RandomizedDelaySec=12h + Persistent=true ++ ++[Install] ++WantedBy=mdmonitor.service +--- a/systemd/mdcheck_start.timer ++++ b/systemd/mdcheck_start.timer +@@ -14,4 +14,5 @@ + Persistent=true + + [Install] +-WantedBy= mdmonitor.service ++WantedBy=mdmonitor.service ++Also=mdcheck_continue.timer diff -Nru mdadm-4.1/debian/patches/series mdadm-4.1/debian/patches/series --- mdadm-4.1/debian/patches/series 2020-09-24 11:54:15.000000000 +0000 +++ mdadm-4.1/debian/patches/series 2020-09-28 16:27:11.000000000 +0000 @@ -21,3 +21,4 @@ randomize-timers.patch systemd-honor-debconf-daily-scan.patch mdcheck-log-when-done.patch +mdcheck-when-mdcheck-start-is-enabled-mdcheck-continue-too.patch