profile-gc: Start the timer on boot

We have to use both OnActiveSec and OnUnitActiveSec, the former to run
the service the first time and the latter to trigger subsequent runs.

diff --git a/modules/profile-gc.nix b/modules/profile-gc.nix
index ba2821a8fc599e45397c6550c59cb547283d550f..a763875d1d3b7a27af05aefc100b93cae6aa2841 100644 (file)
--- a/modules/profile-gc.nix
+++ b/modules/profile-gc.nix
@@ -105,7 +105,7 @@ in {
       fi
 
       alive_threshold="$(< ${parse-duration cfg.activeThreshold})"
       fi
 
       alive_threshold="$(< ${parse-duration cfg.activeThreshold})"

-      alive_loginterval="$(< ${parse-duration config.systemd.timers.profile-gc-log-active.timerConfig.OnUnitActiveSec})"
+      alive_loginterval="$(< ${parse-duration cfg.activeMeasurementGranularity})"

       if (( alive_threshold < alive_loginterval ));then
         echo "Liveness threshold is too low.  Not doing any profile garbage collection." >&2
         exit 0
       if (( alive_threshold < alive_loginterval ));then
         echo "Liveness threshold is too low.  Not doing any profile garbage collection." >&2
         exit 0


@@ -197,6 +197,7 @@ in {
     '';
     systemd.timers.profile-gc-log-active = {
       wantedBy = [ "timers.target" ];
     '';
     systemd.timers.profile-gc-log-active = {
       wantedBy = [ "timers.target" ];

+      timerConfig.OnActiveSec = cfg.activeMeasurementGranularity;

       timerConfig.OnUnitActiveSec = cfg.activeMeasurementGranularity;
     };
     systemd.services.profile-gc-log-active = {
       timerConfig.OnUnitActiveSec = cfg.activeMeasurementGranularity;
     };
     systemd.services.profile-gc-log-active = {