about summary refs log tree commit diff
diff options
context:
space:
mode:
author7c6f434c <7c6f434c@mail.ru>2023-12-24 18:18:56 +0000
committerGitHub <noreply@github.com>2023-12-24 18:18:56 +0000
commit79fee6027b432958825b0bb83a1538314327a8a6 (patch)
tree90a3480d48720ee00ec362e958a251e9f9d03002
parent380761c2f5cbf9281c33e8b9c04ef8dbad4f9862 (diff)
parent8164b71bf92c2fd5ab3b6572a77b87ef5f5aa0dc (diff)
Merge pull request #276318 from someplaceguy/u/fix-atop-start
nixos/atop: remove leftover `*.new` files before starting conversion
-rw-r--r--nixos/modules/programs/atop.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index 7d9491d1fc1f3..003cfdbfc8fad 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -137,6 +137,7 @@ in
                 atop.preStart = ''
                   set -e -u
                   shopt -s nullglob
+                  rm -f "$LOGPATH"/atop_*.new
                   for logfile in "$LOGPATH"/atop_*
                   do
                     ${atop}/bin/atopconvert "$logfile" "$logfile".new
@@ -144,9 +145,9 @@ in
                     # false positives for atop-rotate.service
                     if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new
                     then
-                      ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"
+                      mv -v -f "$logfile".new "$logfile"
                     else
-                      ${pkgs.coreutils}/bin/rm -f "$logfile".new
+                      rm -f "$logfile".new
                     fi
                   done
                 '';